diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2020-12-02 15:33:52 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-12-02 15:34:14 +0100 |
commit | 205ee010f6a790eb45bcfc75676d62530338dec7 (patch) | |
tree | 46ce1ce84c35e4f1380ffdab17f068bfdf4af4ca | |
parent | 0a991fad5d9d2cea4687dcf43f94be40061e0b37 (diff) | |
parent | 9a1065afec18c5a76d3a95e77aa70d7a24252056 (diff) | |
download | jgit-205ee010f6a790eb45bcfc75676d62530338dec7.tar.gz jgit-205ee010f6a790eb45bcfc75676d62530338dec7.zip |
Merge branch 'stable-5.9'
* stable-5.9:
Prepare 5.3.10-SNAPSHOT builds
JGit v5.3.9.202012012026-r
Prepare 5.1.16-SNAPSHOT builds
JGit v5.1.15.202012011955-r
Fix PackInvalidException when fetch and repack run concurrently
Change-Id: I3cf6c71e8310c1d7ef333d4a9c23fa41f45118c4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java index 254c020237..e112fe7444 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java @@ -650,6 +650,7 @@ public class PackFile implements Iterable<PackIndex.MutableEntry> { private void doOpen() throws IOException { if (invalid) { + openFail(true, invalidatingCause); throw new PackInvalidException(packFile, invalidatingCause); } try { |