diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2020-12-02 15:21:10 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-12-02 15:21:32 +0100 |
| commit | c9d871f15d4daa4ab959b34d2a0759016e415643 (patch) | |
| tree | ac26cd822dc93685d13dd084c74f1b6eb93244dc | |
| parent | ad902087820c1b2b3147b45ffbac4e3804274f9c (diff) | |
| parent | e62a93955bbde6da71ab41beb654363f282af697 (diff) | |
| download | jgit-c9d871f15d4daa4ab959b34d2a0759016e415643.tar.gz jgit-c9d871f15d4daa4ab959b34d2a0759016e415643.zip | |
Merge branch 'stable-5.5' into stable-5.6
* stable-5.5:
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: I986029816ef66fbfae1a59bd97179392320a485c
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 f096908eb0..e7d917bb7a 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 { |