From 77f5ee0d66b9053061458f6e4cdc148decfd4b0c Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 9 Apr 2012 16:37:57 -0500 Subject: [PATCH] fast-export: report SHA-1 instead of gibberish when marks exist already Cc: Pieter de Bie Signed-off-by: Johannes Schindelin --- builtin/fast-export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 137792d49d..1213155acf 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -644,7 +644,7 @@ static void import_marks(char *input_file) die ("Could not read blob %s", sha1_to_hex(sha1)); if (object->flags & SHOWN) - error("Object %s already has a mark", sha1); + error("Object %s already has a mark", sha1_to_hex(sha1)); mark_object(object, mark); if (last_idnum < mark) -- 2.11.4.GIT