Re: [RFC/PATCH 0/2] merge-base: add --merge-child option

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: May 13, 2013, 14:45 UTC
Message-ID: <5190FC97.6020800@drmicha.warpmail.net>
In-Reply-To: <5190F806.6040207@bracey.fi>

Kevin Bracey venit, vidit, dixit 13.05.2013 16:26:

Show 21 quoted lines

> On 13/05/2013 01:22, Junio C Hamano wrote:
>> Kevin Bracey <kevin@bracey.fi> writes:
>>
>>>     git log --ancestry-path --left-right E...F --not $(git merge-base
>>> --all E F)
>>>
>>> which looks like we're having to repeat ourselves because it's not
>>> paying attention...
>> You are half wrong; "--left-right" is about "do we show the </>/=
>> marker in the output?", so it is true that it does not make sense
>> without "...", but the reverse is not true: A...B does not and
>> should not imply --left-right.
>>
> The repetition I meant is that by the definition of ancestry-path, the 
> above would seem to be equivalent to
> 
>    git log --ancestry-path --left-right E F --not $(git merge-base --all E F) $(git merge-base --all E F)
> 
> Anyway, revised separated-out version of the patch follows.
> 
> Kevin

It is certainly true that "git log --cherry" needs much less information than what the merge base machinery provides. I've been experimenting with that in order to get the speedup which is necessary for replacing the "git cherry" code with calls into the revision walker using "--cherry".

But I can't wrap my head around the feature proposed here, sorry.

Michael