[PATCH] fast-export: report SHA-1 instead of gibberish when marks

[PATCH] fast-export: report SHA-1 instead of gibberish when marks

[Max Horn]

This patch should be a fairly obvious bug fix. Just yesterday I run into
it, when testing some buggy code that lead to this error message being
triggered; the results was lots of unreadable binary gibberish
filling my terminal.

While I did not author this commit, I asked its author for (and received)
permission to submit it here. Hopefully this can be included in mainline git
(this would ease work on git-remote-hg a bit ;).

[PATCH] fast-export: report SHA-1 instead of gibberish when marks exist already

[Max Horn]

From: Johannes Schindelin <johannes.schindelin@gmx.de>

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>
---
 builtin/fast-export.c |    2 +-
 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)

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)
-- 
1.7.10.4

Re: [PATCH] fast-export: report SHA-1 instead of gibberish when marks exist already

[Junio C Hamano]

Max Horn <max@quendi.de> writes:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> 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>
> ---

Thanks, both.  Applied.

>  builtin/fast-export.c |    2 +-
>  1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
>
> 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)