diff options
| author | Han-Wen NIenhuys <hanwen@google.com> | 2023-02-02 09:00:56 -0500 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2023-02-02 09:00:56 -0500 |
| commit | f94ab7680cbe790e9662820fcef4bf4e8dfa9ed2 (patch) | |
| tree | 162207275efeea286e0bcd059275f87936926683 /org.eclipse.jgit | |
| parent | 8898d62dbcce12ac098900d87ea8d0913f1dac90 (diff) | |
| parent | a399bd13b1d754d3e0d9c23fc70b1a5705dc7485 (diff) | |
| download | jgit-f94ab7680cbe790e9662820fcef4bf4e8dfa9ed2.tar.gz jgit-f94ab7680cbe790e9662820fcef4bf4e8dfa9ed2.zip | |
Merge "PatchApplier fix - init cache with provided tree"
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java index 2a4de1331d..98a2804ee4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java @@ -194,7 +194,7 @@ public class PatchApplier { throw new PatchFormatException(p.getErrors()); } - DirCache dirCache = (inCore()) ? DirCache.newInCore() + DirCache dirCache = inCore() ? DirCache.read(reader, beforeTree) : repo.lockDirCache(); DirCacheBuilder dirCacheBuilder = dirCache.builder(); |