diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2012-06-12 15:45:16 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-06-12 07:25:11 -0700 |
| commit | 43bc2302706af6a3bb9266eea1bcb7071c54c8c6 (patch) | |
| tree | 2b61e30ffe058d774da8066406441c3badcd24f3 /builtin-fast-export.c | |
| parent | builtin-fast-export: Add importing and exporting of revision marks (diff) | |
| download | tgif-43bc2302706af6a3bb9266eea1bcb7071c54c8c6.tar.xz | |
fast-export: report SHA-1 instead of gibberish when marks exist already
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>
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 45786ef1b7..1bf4e06713 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -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) |