Junio C Hamano  committed ca4effd Merge

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

"git fast-export" did not give a readable error message when the same
mark erroneously appeared twice in the --import-marks input.

  • Participants
  • Parent commits 121f71f, 43bc230
  • Branches master

Comments (0)

Files changed (1)

File builtin/fast-export.c

 			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)