From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Jun 2012 14:26:54 GMT
Subject: Re: [PATCH] fast-export: report SHA-1 instead of gibberish when marks exist already
Message-ID: <7vtxyg4ndd.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1339508716-51880-2-git-send-email-max@quendi.de>

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)