commit | e62a93955bbde6da71ab41beb654363f282af697 | [log] [tgz] |
---|---|---|
author | Matthias Sohn <matthias.sohn@sap.com> | Wed Dec 02 15:15:58 2020 +0100 |
committer | Matthias Sohn <matthias.sohn@sap.com> | Wed Dec 02 15:16:11 2020 +0100 |
tree | fcbe96ff5cc7abba274e5315a4a55caa263baf7e | |
parent | c2dfd68b73d002bb0df9c7a1a8e45a4a5c39b4fa [diff] | |
parent | e8948056fa19df07fa6fb0e8748a2ffcb44561b5 [diff] |
Merge branch 'stable-5.4' into stable-5.5 * stable-5.4: 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: Iede8686198332d6271771bef6eb00c25f1103979 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 88e05af..86e90c6 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 @@ private void doOpen() throws IOException { if (invalid) { + openFail(true, invalidatingCause); throw new PackInvalidException(packFile, invalidatingCause); } try {