From: Phil Hord <hordp@cisco.com>
Date: Thu, 25 Oct 2012 18:50:37 GMT
Subject: Re: [PATCHv2] git-pull: Avoid merge-base on detached head
Message-ID: <508989FD.7090101@cisco.com>
In-Reply-To: <20121025093441.GH8390@sigill.intra.peff.net>

Jeff King wrote:
> On Tue, Oct 23, 2012 at 04:39:56PM -0400, Phil Hord wrote:
>
>> git pull --rebase does some clever tricks to find the base
>> for $upstream , but it forgets that we may not have any
>> branch at all.  When this happens, git merge-base reports its
>> "usage" help in the middle of an otherwise successful
>> rebase operation, because git-merge is called with one too
>> few parameters.
>>
>> Since we do not need the merge-base trick in the case of a
>> detached HEAD, detect this condition and bypass the clever
>> trick and the usage noise.
> Makes sense. I notice there is no test with your patch. It sounds from
> the description like the operation still may succeed, but we just get
> cruft on stderr?
>

Yes, that's correct.

P