diff options
| author | Matthias Sohn | 2020-12-02 01:17:27 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2020-12-02 01:17:41 +0000 |
| commit | babc56ef0f6842549d59743b061c3dd1463bd626 (patch) | |
| tree | 66bb5dead5efbec212403294f0cc05bbdad414ea | |
| parent | 65598b95161e3766c31bddeb45bc5d628b6d90fd (diff) | |
| parent | 5e0cfce5ad48b84ca12526ef12461a72dde2800c (diff) | |
| download | jgit-babc56ef0f6842549d59743b061c3dd1463bd626.tar.gz jgit-babc56ef0f6842549d59743b061c3dd1463bd626.tar.xz jgit-babc56ef0f6842549d59743b061c3dd1463bd626.zip | |
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
Prepare 5.1.16-SNAPSHOT builds
JGit v5.1.15.202012011955-r
Fix PackInvalidException when fetch and repack run concurrently
Change-Id: Id83e29e567646a3945a5b817860ea8f7c3e6e5cf
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 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 { |