aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2019-02-18 11:20:56 +0900
committerDavid Pursehouse <david.pursehouse@gmail.com>2019-02-18 11:20:56 +0900
commit90876890bc28f0baad5b12b8aa2f189a6738e1c3 (patch)
treedb26b6861dccc41abd83e92ab8285de09dc44f6d /org.eclipse.jgit
parent56562221d626922a02f962d60141be6f293e2914 (diff)
parent962babc4b27ffd90058fe7734f17ed1c4e77d958 (diff)
downloadjgit-90876890bc28f0baad5b12b8aa2f189a6738e1c3.tar.gz
jgit-90876890bc28f0baad5b12b8aa2f189a6738e1c3.zip
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1: ObjectDirectory: extra logging on packfile exceptions Change-Id: Id2fea30664d53b31ad026ee5ae06a5a24d731a52
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 4d5c1c0345..6be7652436 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
@@ -360,6 +360,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);
}
}
@@ -652,6 +653,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) {