summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2019-02-18 11:22:31 +0900
committerDavid Pursehouse <david.pursehouse@gmail.com>2019-02-18 11:22:31 +0900
commit29022555265588ece95b4e206808aec9f73f6045 (patch)
tree3bd83151b7c07b684030e62edce2d120b9513fd6 /org.eclipse.jgit
parent3ae22bdf66d926f7f1761195580e7de7c7fadc52 (diff)
parent9d02e524067376c5ea352dc3034c0c21a0f4ffbb (diff)
downloadjgit-29022555265588ece95b4e206808aec9f73f6045.tar.gz
jgit-29022555265588ece95b4e206808aec9f73f6045.zip
Merge branch 'stable-5.3'
* stable-5.3: ObjectDirectory: extra logging on packfile exceptions Prepare 5.3.0-SNAPSHOT builds JGit v5.3.0.201901162155-m1 Fix tools/version.sh JGit v5.3.0.201901161700-m1 Change-Id: I3c511fbc08f21eec5bb49d443de33d43094da4a4
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
index 9b4323efe1..ad5afbf68e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
@@ -359,6 +359,7 @@ public class ObjectDirectory extends FileObjectDatabase {
// The hasObject call should have only touched the index,
// so any failure here indicates the index is unreadable
// by this process, and the pack is likewise not readable.
+ LOG.warn("Unable to read packfile " + p.getPackFile(), e);
removePack(p);
}
}
@@ -651,6 +652,7 @@ public class ObjectDirectory extends FileObjectDatabase {
if ((e instanceof CorruptObjectException)
|| (e instanceof PackInvalidException)) {
warnTmpl = JGitText.get().corruptPack;
+ LOG.warn("Packfile " + p.getPackFile() + " is corrupted", e);
// Assume the pack is corrupted, and remove it from the list.
removePack(p);
} else if (e instanceof FileNotFoundException) {