aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2020-12-02 15:28:33 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2020-12-02 15:28:33 +0100
commit8f422e9a9add4a7a7d972e8aa1dfa5e15fccdf99 (patch)
treec22fcd5193054613252d88215dba552a3a0250fe
parentd1801402fee871610e983846225afd6339ce8ffd (diff)
parentf621c31f4ca35a440535bf9e98382eae8a1f4643 (diff)
downloadjgit-8f422e9a9add4a7a7d972e8aa1dfa5e15fccdf99.tar.gz
jgit-8f422e9a9add4a7a7d972e8aa1dfa5e15fccdf99.zip
Merge branch 'stable-5.7' into stable-5.8
* stable-5.7: 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: I638ee6409f25ac8bcb2e365b1c37939b520b289f
-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 {