Re: [PATCH/RFC] Do not show "diff --git" metainfo with --no-prefix

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 16, 2008, 01:37 UTC
Message-ID: <alpine.LSU.1.00.0801160133150.17650@racer.site>
In-Reply-To: <7v4pded1rk.fsf_-_@gitster.siamese.dyndns.org>

Hi,

On Tue, 15 Jan 2008, Junio C Hamano wrote:

Show 21 quoted lines

> diff --git a/diff.c b/diff.c
> index b18c140..8126a74 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -1246,30 +1258,46 @@ static void builtin_diff(const char *name_a,
>  	char *a_one, *b_two;
>  	const char *set = diff_get_color_opt(o, DIFF_METAINFO);
>  	const char *reset = diff_get_color_opt(o, DIFF_RESET);
> +	int is_git_diff = with_standard_prefix(o);
>  
>  	a_one = quote_two(o->a_prefix, name_a + (*name_a == '/'));
>  	b_two = quote_two(o->b_prefix, name_b + (*name_b == '/'));
>  	lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
>  	lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
> -	printf("%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
> +
> +	if (!is_git_diff)
> +		printf("%sIndex: %s%s\n", set, b_two, reset);
> +	else
> +		printf("%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
> +

Hmm. AFAICT plain diff outputs "diff ...", not "Index: ...". IMHO doing half of what SVN does, and half what GNU diff does, but not completely what something else does, does not help anybody.

So I'm mildly negative on this hunk.

Also, I am not quite sure what to do about the "rename from" and "copy from" headers... The "--git" was always an indication that this patch may contain something like these headers.

All in all, I think this would be too much. Let's just keep our patch format, and if anybody else is not able to grok unified diffs as we output them, have a transformer. Let's not have git core affected.

Ciao, Dscho