[PATCH] fast-export: report SHA-1 instead of gibberish when marks exist already

From

Max Horn <max@quendi.de>

Date

Jun 12, 2012, 13:45 UTC

Message-ID

<1339508716-51880-2-git-send-email-max@quendi.de>

In-Reply-To

<1339508716-51880-1-git-send-email-max@quendi.de>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

Cc: Pieter de Bie <pdebie@ai.rug.nl>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Max Horn <max@quendi.de>
---
 builtin/fast-export.c |    2 +-
 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 19509ea..ef7c012 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -610,7 +610,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)

-- 
1.7.10.4