diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-12 16:27:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-12 16:27:50 +0200 |
| commit | 87725757af66f3dd6c4141ebe3e410cb6f2e7210 (patch) | |
| tree | e265fdd5e61d7849b1204f4f44af18a6c91ccf2f /builtin/fast-export.c | |
| parent | git-svn: use YAML format for mergeinfo cache when possible (diff) | |
| parent | fast-export: report SHA-1 instead of gibberish when marks exist already (diff) | |
| download | git-87725757af66f3dd6c4141ebe3e410cb6f2e7210.tar.xz git-87725757af66f3dd6c4141ebe3e410cb6f2e7210.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 19509ea754..ef7c012094 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) |