Re: What's cooking in git.git (Feb 2017, #03; Fri, 10)

From: Vegard Nossum <vegard.nossum@oracle.com>
Date: Feb 12, 2017, 18:32 UTC
Message-ID: <36fdf8c9-f82d-4996-09ef-7d718ab3ac41@oracle.com>
In-Reply-To: <xmqq8tpdifoa.fsf@gitster.mtv.corp.google.com>

On 11/02/2017 04:12, Junio C Hamano wrote:

Show 20 quoted lines

> René Scharfe <l.s.r@web.de> writes:
>
>> Am 10.02.2017 um 23:24 schrieb Junio C Hamano:
>>> * vn/xdiff-func-context (2017-01-15) 1 commit
>>>  - xdiff -W: relax end-of-file function detection
>>>
>>>  "git diff -W" has been taught to handle the case where a new
>>>  function is added at the end of the file better.
>>>
>>>  Will hold.
>>>  Discussion on an follow-up change to go back from the line that
>>>  matches the funcline to show comments before the function
>>>  definition has not resulted in an actionable conclusion.
>>
>> This one is a bug fix and can be merged already IMHO.
>
> Absolutely.  I was just waiting if the follow-up discussion would
> easily and quickly lead to another patch, forgot about what exactly
> I was waiting for (i.e. the gravity of not having the follow-up),
> and have left it in "Will hold" status forever.

I said I would resubmit the patches with more config options and more command-line arguments (to avoid potentially breaking backwards compatibility), but IIRC the response seemed to be "preceding blank line heuristic is good enough" and "why bother", so I ended up not not resubmitting anything.

>
> Let's merge it to 'next' and then decide if we want to also merge it
> to 'master' before the final.  The above step alone is a lot less
> contriversial and tricky bugfix.

Thanks,

Vegard