From 43bc2302706af6a3bb9266eea1bcb7071c54c8c6 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin <johannes.schindelin@gmx.de> Date: Tue, 12 Jun 2012 15:45:16 +0200 Subject: [PATCH] fast-export: report SHA-1 instead of gibberish when marks exist already 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> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- 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 45786ef1b..1bf4e0671 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -419,7 +419,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)