diff options
author | Thomas Wolf <twolf@apache.org> | 2023-08-11 21:40:13 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-09-03 00:16:26 +0200 |
commit | 9072103f3b3cf64dd12ad2949836ab98f62dabf1 (patch) | |
tree | 7081abbefb5f7132b63716d35bfbaf2f223f58b1 /org.eclipse.jgit/.settings | |
parent | b4c3a5da0d764d62406d9f82a0e7c058062e91b3 (diff) | |
download | jgit-9072103f3b3cf64dd12ad2949836ab98f62dabf1.tar.gz jgit-9072103f3b3cf64dd12ad2949836ab98f62dabf1.zip |
Checkout: better directory handling
When checking out a file into the working tree ensure that all parent
directories of the file below the working tree root are actually
directories and do exist before we try to create the file.
When multiple files are to be checked out (or even a whole tree), this
may check the same directories over and over again. Asking the file
system every time for file attributes is a potentially expensive
operation. As a remedy, introduce an in-memory cache of directory
states for a particular check-out operation.
Apply the same fix also in the ResolveMerger, which may also check out
files, and also in the PatchApplier. In PatchApplier, also validate
paths.
Change-Id: Ie12864c54c9f901a2ccee7caddec73027f353111
Signed-off-by: Thomas Wolf <twolf@apache.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
-rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 75697fd88a..35a3a0aeba 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,5 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jgit" version="2"> + <resource path="src/org/eclipse/jgit/dircache/Checkout.java" type="org.eclipse.jgit.dircache.Checkout"> + <filter id="1109393411"> + <message_arguments> + <message_argument value="6.6.1"/> + <message_argument value="org.eclipse.jgit.dircache.Checkout"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/errors/PackMismatchException.java" type="org.eclipse.jgit.errors.PackMismatchException"> <filter id="1142947843"> <message_arguments> @@ -22,6 +30,14 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/lib/FileModeCache.java" type="org.eclipse.jgit.lib.FileModeCache"> + <filter id="1109393411"> + <message_arguments> + <message_argument value="6.6.1"/> + <message_argument value="org.eclipse.jgit.lib.FileModeCache"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/revwalk/RevCommit.java" type="org.eclipse.jgit.revwalk.RevCommit"> <filter id="1193279491"> <message_arguments> |