From 986d616ed4f1fc4cfcf3fbc4d5ad4569030b748a Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Tue, 2 Feb 2010 10:49:32 -0800 Subject: [PATCH] Correct ObjectWalk error message when bad object is found Instead of including "ObjectId[SHA-1]" in the message, just us the formatted SHA-1 name of the object by calling name(). Change-Id: I0d1d0e8207f8a3f02188e60242e4e9bf7420e88f Signed-off-by: Shawn O. Pearce --- .../src/org/eclipse/jgit/revwalk/ObjectWalk.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java index b1796b258..690458593 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java @@ -283,9 +283,9 @@ public class ObjectWalk extends RevWalk { break; treeWalk.getEntryObjectId(idBuffer); throw new CorruptObjectException("Invalid mode " + mode - + " for " + idBuffer.name() + " " - + treeWalk.getEntryPathString() + " in " + currentTree - + "."); + + " for " + idBuffer.name() + " '" + + treeWalk.getEntryPathString() + "' in " + + currentTree.name() + "."); } treeWalk = treeWalk.next();