Re: [PATCH 0/2] Re* Consequences of CRLF in index?

From: Stefan Beller <sbeller@google.com>
Date: Oct 31, 2017, 16:41 UTC
Message-ID: <CAGZ79kaSQzLEjmD3+YgQOz5cety9Y3MZmUo7EkKA-JdQRt_Diw@mail.gmail.com>
In-Reply-To: <xmqqpo942fzk.fsf@gitster.mtv.corp.google.com>

On Mon, Oct 30, 2017 at 7:44 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 8 quoted lines

> Stefan Beller <sbeller@google.com> writes:
>
>> (I note this as you regard your patches as a lunch time hack
>> in the cooking email; I am serious about these patches though.)
>
> We do not want to touch borrowed code unnecessarily.  Are these
> lines and bits hampering further progress we are actively trying to
> make right now?

No they are not, you are correct.

I differ in opinion on 'borrowed code'. The latest release of xdiff (v0.23) was in Nov 13, 2008 according to http://freecode.com/projects/xdiff-lib or on March 23, 2006 according to https://directory.fsf.org/wiki/LibXDiff and given that we incorporated so many changes already to xdiff, I would argue it is sufficiently different from the original, we'll probably never import another upstream version (if there will be a release at all).

So the code was rather taken and now we are the bag holders in maintaining it, so we can make it pretty even only for the sake of pleasing ourselves (or rather: not confusing ourselves with too many unused flags).

Thanks, Stefan