Re: [PATCH] merge-recursive: ignore_case shouldn't reject intentional removals

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 26, 2017, 02:32 UTC
Message-ID: <xmqqk1ydkbx0.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CABPp-BGcfFOvv+-uW2_EaftLiU-xs_D4g8hsYOZqjk1XwK_8Fw@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> I had another email I had been composing to try to argue for changing
> merge-recursive.c's design to the above, assuming I could get the time
> to work on it.  Nice to see that I'm not crazy, and that I apparently
> don't need to do much convincing.  :-)

You might even be better off coming up with a *new* merge strategy backend if you want to do this, without using much from the existing code in merge-recursive.c at all (I've written off that code as mostly unsalvageable long time ago, and thanked for whoever had a clever idea to allow different strategy backend to be made without disrupting the rest of the system).

After we gain more confidence with the rewrite, we can switch the internally built-in backend used by different codepaths from merge-recursive.c::merge_recursive() to the new thing.