Re: [PATCH] diff.c: Fix whitespace issues due to a mismerge(?)

From: Junio C Hamano <gitster@pobox.com>
Date: May 9, 2017, 02:06 UTC
Message-ID: <xmqqo9v26ax1.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170508184354.31671-1-sbeller@google.com>

Stefan Beller <sbeller@google.com> writes:

Show 14 quoted lines

> It looks like all these lines were introduced by one of the conflict chunks
> in 4af9a7d344 (Merge branch 'bc/object-id', 2016-09-19). Viewing that
> commit in gitk, the indentation seems fine, i.e. there is just one
> whitespace in front of the lines, as you would expect from a formatted
> patch.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>
>  Junio, 
>  I do not think it is worth to apply this patch on its own,
>  but maybe it is worth to investigate your setup? (Assuming it is
>  git that did the merge, we may have a bug in whitespacing and
>  merge conflicts.)

Thanks for spotting.

I do not think you have to worry about any bug in Git-the-program with this merge. If you try to reproduce the merge yourself (which by the way is easy to do, with "M=4af9a7d344 && git checkout $M^ && git merge $M^2"), you'll see that quite a lot of changes made to "builtin/apply.c" had to be hand-ported to the corresponding lines that are now in "apply.c" at the top-level, because in the meantime 13b5af22 ("apply: move libified code from builtin/apply.c to apply.{c,h}", 2016-04-22) moved things around while the merged side branch has been cooking.

It is very likely that manual killing and yanking in Emacs introduced the screw-up.