summaryrefslogtreecommitdiff
path: root/builtin/fast-export.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-12 14:27:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-06-12 14:27:50 (GMT)
commit87725757af66f3dd6c4141ebe3e410cb6f2e7210 (patch)
treee265fdd5e61d7849b1204f4f44af18a6c91ccf2f /builtin/fast-export.c
parent68f532f4ba888f277637a94b4a49136054df0540 (diff)
parent43bc2302706af6a3bb9266eea1bcb7071c54c8c6 (diff)
downloadgit-87725757af66f3dd6c4141ebe3e410cb6f2e7210.zip
git-87725757af66f3dd6c4141ebe3e410cb6f2e7210.tar.gz
git-87725757af66f3dd6c4141ebe3e410cb6f2e7210.tar.bz2
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
Diffstat (limited to 'builtin/fast-export.c')
-rw-r--r--builtin/fast-export.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 19509ea..ef7c012 100644
--- 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)