Skip to content

Commit

Permalink
fast-export: report SHA-1 instead of gibberish when marks exist already
Browse files Browse the repository at this point in the history
Cc: Pieter de Bie <pdebie@ai.rug.nl>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Max Horn <max@quendi.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Jun 12, 2012
1 parent df6a7ff commit 43bc230
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin-fast-export.c
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,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)
Expand Down

0 comments on commit 43bc230

Please sign in to comment.