Re: [PATCH] fast-export: report SHA-1 instead of gibberish when marks exist already
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:54:03
Max Horn [off-list ref] writes:
From: Johannes Schindelin <redacted> Cc: Pieter de Bie <redacted> Signed-off-by: Johannes Schindelin <redacted> Signed-off-by: Max Horn <redacted> ---
Thanks, both. Applied.
quoted hunk
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)