Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2019-03-04 12:28:25 +0000
committerMatthias Sohn2019-03-06 01:36:38 +0000
commite8f7bb3608589edc06d80605e2157ff68a9719b6 (patch)
treec86c18a06e9de30825d8e20c975e33637794dfdf
parente8bd9556c0c43e272a8d1d105f1108a2568e2482 (diff)
downloadjgit-e8f7bb3608589edc06d80605e2157ff68a9719b6.tar.gz
jgit-e8f7bb3608589edc06d80605e2157ff68a9719b6.tar.xz
jgit-e8f7bb3608589edc06d80605e2157ff68a9719b6.zip
Properly format pack checksums in PackFile.idx()
Change-Id: Id805850dbe9a3d633168f3056e06ddeafd86f961 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> (cherry picked from commit a33e4dc58a87daf34072b82643aba0fd4456c165)
-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 58c314130e..d28c04fd64 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) {

Back to the top