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

Junio C Hamano writes: > 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"),

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

Stefan Beller writes: > 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,

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

Re-indent lines, as they were off by one. When a line was not indented (as you would expect from function defintions) we had a stray whitespace preceding the line. Indented lines have a stray white space after the indentation by tabs, before the actual text, i.e. if (...) ... It looks like all