Re: [PATCH] Allow combined diff to ignore white-spaces
- From
Antoine Pelisse <apelisse@gmail.com>
- Date
- Mar 4, 2013, 18:50 UTC
- Message-ID
- <CALWbr2xPJQ1tvyT6Q84ccn=k6fg8A1aUbJG7FQjjJGZGC5voGg@mail.gmail.com>
- In-Reply-To
- <7vy5e3vwos.fsf@alter.siamese.dyndns.org>
On Mon, Mar 4, 2013 at 7:36 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 12 quoted lines
> Antoine Pelisse <apelisse@gmail.com> writes: > >> It feels incorrect to me to coalsesce "- 5" and "- 5" as it might >> look incorrect to the user. But still the idea is appealing. > > The users already need to see that when reading a regular patch with > one or more context lines and -b/-w/etc., anyway. The context lines > are made into context only because whitespace differences were > ignored, and in the regular unified patch format we can show only > one version, either from preimage or from postimage, and have to > pick one. Coalescing "- 5" and "- 5" into "--5" or "-- 5" by > picking one or the other is the same thing, no?
That's all I needed to be convinced. I obviously don't care which one we pick.
Show 7 quoted lines
>> Using the exact example you gave, and running the latest next, I have >> this output, where 11 is not coalesced. >> Is that a bug ? > > It could be tickling a corner case because the removal is at the end > of the file. Perhaps adding 12 that is all common across three > versions and see what happens?
Doesn't make a difference. Still have "- 11" and " -11". I will try to have a look at it.