undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
"git fast-export" did not give a readable error message when the same
mark erroneously appeared twice in the --import-marks input.
This commit is contained in:
Junio C Hamano 2012-06-17 14:00:03 -07:00
commit ca4effd8bc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/fast-export.c
View File

@ -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)