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
2012-06-12 07:27:50 -07:00 · 2012-06-12 07:27:50 -07:00 · 87725757af
parent 68f532f4ba 43bc230270
commit 87725757af
1 changed files with 1 additions and 1 deletions
--- 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)