Merge branch 'js/maint-fast-export-mark-error'

* js/maint-fast-export-mark-error:
fast-export: report SHA-1 instead of gibberish when marks exist already

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 19509ea75485083b40d6c7944541a5f628b6049b..ef7c0120949c4ce1667c9d1d8e74a9c63c8adc02 100644 (file)
--- 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)