Re: Have git-merge-base support multiple IDs

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Jul 31, 2009, 16:22 UTC
Message-ID: <4A731A39.3090506@drmicha.warpmail.net>
In-Reply-To: <alpine.LSU.2.00.0907311745100.4901@fbirervta.pbzchgretzou.qr>

Jan Engelhardt venit, vidit, dixit 31.07.2009 17:51:

Show 28 quoted lines

> Hi,
> 
> 
> I am using git merge-base as sort of a hack to determine where to start 
> rebasing.
> Suppose this is the commit log (git log --oneline), of course, all 
> unpublished, which is why rebase comes in:
> 
>   98683793  Fix For faae2553
>   3365a01b  Fix For ab80794f
>   62943a23  Feature Baz
>   ab80794f  Feature Bar
>   faae2553  Feature Foo
> 
> To determine the rebase point (i.e. first commit in a series),
> one can (ab)use git-merge-base:
> 
>   p=$(git merge-base ab80794f faae2553)
>   git re -i ${p}^
> 
> And then reorder ab80794f, faae2553 to squash the fixes into the 
> appropriate commits. This practice works well somewhat.
> The twist is that merge-base in git 1.6.3.3 happens to ignore any 
> further arguments following two IDs. In short:
> 
>   git merge-base A B C...
> 
> Only yields the merge-base of A and B, and ignores C...

Uhm, are you sure about this?
The first argument is special.
merge-base computes the merge base between two commits:
- the first argument
- a (hypothetical) merge between all other arguments.

It may look a if C was ignored, though.

Michael