mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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
This commit is contained in:
commit
87725757af
|
@ -610,7 +610,7 @@ static void import_marks(char *input_file)
|
||||||
die ("Could not read blob %s", sha1_to_hex(sha1));
|
die ("Could not read blob %s", sha1_to_hex(sha1));
|
||||||
|
|
||||||
if (object->flags & SHOWN)
|
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);
|
mark_object(object, mark);
|
||||||
if (last_idnum < mark)
|
if (last_idnum < mark)
|
||||||
|
|
Loading…
Reference in a new issue