git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCHv2] git-pull: Avoid merge-base on detached head

From
Jeff King <peff@peff.net>
Date
Oct 25, 2012, 09:34 UTC
Message-ID
<20121025093441.GH8390@sigill.intra.peff.net>
In-Reply-To
<1351024796-28174-2-git-send-email-hordp@cisco.com>
On Tue, Oct 23, 2012 at 04:39:56PM -0400, Phil Hord wrote:
Show 10 quoted lines
> 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?

-Peff
Previous: Phil HordNext: Phil Hord
Message 3 of 5 in “[PATCHv2] git-pull: Avoid merge-base on detached head”
  1. Phil HordOct 23, 2012
  2. Phil HordOct 23, 2012
  3. Jeff KingOct 25, 2012
  4. Phil HordOct 25, 2012
  5. Jeff KingOct 26, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.