summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2019-03-04 13:28:25 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2019-03-04 13:28:40 +0100
commita33e4dc58a87daf34072b82643aba0fd4456c165 (patch)
tree62a667d9404a94178eb45070c796f5637decf964
parent882fed0d96c533513c43ae77aaff9cc07b94012c (diff)
downloadjgit-a33e4dc58a87daf34072b82643aba0fd4456c165.tar.gz
jgit-a33e4dc58a87daf34072b82643aba0fd4456c165.zip
Properly format pack checksums in PackFile.idx()
Change-Id: Id805850dbe9a3d633168f3056e06ddeafd86f961 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java5
1 files changed, 3 insertions, 2 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 e85d85cbdc..ed238a40e7 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
@@ -187,8 +187,9 @@ public class PackFile implements Iterable<PackIndex.MutableEntry> {
} else if (!Arrays.equals(packChecksum, idx.packChecksum)) {
throw new PackMismatchException(MessageFormat.format(
JGitText.get().packChecksumMismatch,
- packFile.getPath(), packChecksum,
- idx.packChecksum));
+ packFile.getPath(),
+ ObjectId.fromRaw(packChecksum).name(),
+ ObjectId.fromRaw(idx.packChecksum).name()));
}
loadedIdx = idx;
} catch (InterruptedIOException e) {