Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
fast-export: report SHA-1 instead of gibberish when marks exist already
author
Johannes Schindelin
<johannes.schindelin@gmx.de>
Tue, 12 Jun 2012 13:45:16 +0000
(15:45 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 12 Jun 2012 14:25:11 +0000
(07:25 -0700)
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>
builtin-fast-export.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
df6a7ff
)
diff --git
a/builtin-fast-export.c
b/builtin-fast-export.c
index 45786ef1b740c1e21c1cffeeea89cb0250f446c5..1bf4e06713e3886758eafedfd13ed90da314da0c 100644
(file)
--- 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)