diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2020-12-02 02:18:51 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-12-02 02:19:11 +0100 |
commit | 5bb71dd2d4013eb4147ecbfead248d31a98c5537 (patch) | |
tree | ad0a178c6f3d3e5e3c01e07c6f2bfe4488d3d980 /org.eclipse.jgit/src | |
parent | fdcdfc37a302ca1ff6077bbae45f6a79450c3bfe (diff) | |
parent | babc56ef0f6842549d59743b061c3dd1463bd626 (diff) | |
download | jgit-5bb71dd2d4013eb4147ecbfead248d31a98c5537.tar.gz jgit-5bb71dd2d4013eb4147ecbfead248d31a98c5537.zip |
Merge branch 'stable-5.2' into stable-5.3
* stable-5.2:
Prepare 5.1.16-SNAPSHOT builds
JGit v5.1.15.202012011955-r
Fix PackInvalidException when fetch and repack run concurrently
Change-Id: If1d8034b5e0cbc004a11a31b228cb5732efb390d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src')
-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 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 { |