diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-17 14:00:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-17 14:00:03 -0700 |
| commit | ca4effd8bce5e0dfce7ce1425074475c8643b7f0 (patch) | |
| tree | 9a88d0bb4eb0d9c37debb66303225f5e7d780065 /builtin | |
| parent | Git 1.7.10.4 (diff) | |
| parent | fast-export: report SHA-1 instead of gibberish when marks exist already (diff) | |
| download | tgif-ca4effd8bce5e0dfce7ce1425074475c8643b7f0.tar.xz | |
Merge branch 'js/maint-fast-export-mark-error' into maint
"git fast-export" did not give a readable error message when the same
mark erroneously appeared twice in the --import-marks input.
Diffstat (limited to 'builtin')
| -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) |