Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2020-12-02 13:26:26 +0000
committerMatthias Sohn2020-12-02 13:26:37 +0000
commite8948056fa19df07fa6fb0e8748a2ffcb44561b5 (patch)
tree9f6e345147f998a06b107025e750326ac0143be0
parent43f19924d00bdc19f48b55b0056fed1f9951543b (diff)
parent0a63e045c96c5fdf52c7c86287c4f48c8d64a818 (diff)
downloadjgit-stable-5.4.tar.gz
jgit-stable-5.4.tar.xz
jgit-stable-5.4.zip
Merge branch 'stable-5.3' into stable-5.4stable-5.4
* stable-5.3: 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: I319b54ceffe095add60420c6ae83eac0ba9c14b6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-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 88e05af414..86e90c63c5 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
@@ -684,6 +684,7 @@ public class PackFile implements Iterable<PackIndex.MutableEntry> {
private void doOpen() throws IOException {
if (invalid) {
+ openFail(true, invalidatingCause);
throw new PackInvalidException(packFile, invalidatingCause);
}
try {

Back to the top