From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 23 Jun 2008 15:31:59 GMT
Subject: Re: linux-x86-tip: pilot error?
Message-ID: <20080623153159.GC28394@elte.hu>
In-Reply-To: <20080623151257.GC20902@sigill.intra.peff.net>


* Jeff King <peff@peff.net> wrote:

> On Mon, Jun 23, 2008 at 09:14:41AM +0200, Ingo Molnar wrote:
> 
> > Is there a Git way of finding the common ancestor of a topic branch, 
> > when compared to upstream?
> 
> Try:
> 
>   git merge-base topic upstream

turns out we already use that as a fallback:

    if [ -z "$TREF" ]
    then
        echo "No topic reference found. Using git-merge-base"
        MBASE=`git-merge-base linus HEAD`
        TD=`get_date_for_tag`
        TB=`echo $B | sed "s@/@-@"`
        git-tag "tip-"$TB"-"$TD $MBASE
        TREF="tip-"$TB"-"$TD
    [...]

i guess we could use that unconditionally.

	Ingo