summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2020-12-02 15:31:00 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2020-12-02 15:31:11 +0100
commit9a1065afec18c5a76d3a95e77aa70d7a24252056 (patch)
treed7cfe03cfbba66da84673b993586094a40ba23cf /org.eclipse.jgit
parent23389a63238c50daf0d8d1e3fd2b1d29f4171645 (diff)
parent8f422e9a9add4a7a7d972e8aa1dfa5e15fccdf99 (diff)
downloadjgit-9a1065afec18c5a76d3a95e77aa70d7a24252056.tar.gz
jgit-9a1065afec18c5a76d3a95e77aa70d7a24252056.zip
Merge branch 'stable-5.8' into stable-5.9
* stable-5.8: 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: I08caea979ac4c1298b453e6e5558bccb86fb0181 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java1
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 {