Re: [PATCH v2] fast-export: Make sure we show actual ref names instead of "(null)"

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 22, 2009, 18:34 UTC
Message-ID: <7vk534azjb.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1245676001-14734-3-git-send-email-newren@gmail.com>

newren@gmail.com writes:

Show 16 quoted lines

> From: Elijah Newren <newren@gmail.com>
>
> Under some cases (e.g. 'git fast-export --parents master -- COPYING' run
> in git.git), the output included the lines
>   reset (null)
>   commit (null)
> instead of
>   reset refs/heads/master
>   commit refs/heads/master
> This simple change fixes that.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> (No change to this patch since the first series.)
> As noted above, run 'git fast-export --parents master -- COPYING' in
> git.git to see this bug triggered.

Isn't this easier to read?

Show 12 quoted lines

> Under some cases (e.g. 'git fast-export --parents master -- COPYING' run
> in git.git), the output included the lines
>
>   reset (null)
>   commit (null)
>
> instead of
>
>   reset refs/heads/master
>   commit refs/heads/master
>
> This simple change fixes that.

The last line does not add much value. I would have preferred to see something like this while reviewing, so that I did not have to dig that information out from the source myself:

	This is because the code expects commit->util to point at the ref
	but that is only set by the revision traversal machinery when
	show_source is asked, in a way similar to "--source" option of
	"git log" family of commands.

But otherwise, good catch.  Thanks.

Show 17 quoted lines

>  builtin-fast-export.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/builtin-fast-export.c b/builtin-fast-export.c
> index 891e2d4..9aa409b 100644
> --- a/builtin-fast-export.c
> +++ b/builtin-fast-export.c
> @@ -531,6 +531,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
>  	get_tags_and_duplicates(&revs.pending, &extra_refs);
>  
>  	revs.topo_order = 1;
> +	revs.show_source = 1;
>  	if (prepare_revision_walk(&revs))
>  		die("revision walk setup failed");
>  	revs.diffopt.format_callback = show_filemodify;
> -- 
> 1.6.0.6