| commit | f621c31f4ca35a440535bf9e98382eae8a1f4643 | [log] [tgz] |
|---|---|---|
| author | Matthias Sohn <matthias.sohn@sap.com> | Wed Dec 02 15:25:44 2020 +0100 |
| committer | Matthias Sohn <matthias.sohn@sap.com> | Wed Dec 02 15:26:00 2020 +0100 |
| tree | 6fca36129fb917d29f0fdcce6c0c1bfc235bcb8e | |
| parent | 0248c58b489bc7d8a769ca1da9bb8e172ecd5dbd [diff] | |
| parent | c9d871f15d4daa4ab959b34d2a0759016e415643 [diff] |
Merge branch 'stable-5.6' into stable-5.7 * stable-5.6: 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: If5f001c414e677bb2bac59714421f0191b23ea1f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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 254c020..e112fe7 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 @@ private void doOpen() throws IOException { if (invalid) { + openFail(true, invalidatingCause); throw new PackInvalidException(packFile, invalidatingCause); } try {