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

Re: Confusing git pull error message

From
Jeff King <peff@peff.net>
Date
Oct 5, 2009, 19:12 UTC
Message-ID
<20091005191257.GA24305@coredump.intra.peff.net>
In-Reply-To
<7vljjpacax.fsf@alter.siamese.dyndns.org>
On Mon, Oct 05, 2009 at 12:08:38PM -0700, Junio C Hamano wrote:
Show 9 quoted lines
> Jeff King <peff@peff.net> writes:
> 
> > So I think we need something like this. I wasn't able to figure out a
> > test case to trigger the first code path below, though. It may not be
> > possible; if we give a refspec on the command line, either it will be a
> > candidate for merging or, if it does not exist, fetch will barf. So it
> > may be that we can just collapse it down to a single case.
> 
> I think you are right.

Nope, I'm not. I figured out one more case that it needs to handle. Revised patch coming up in a few minutes.

Show 8 quoted lines
> By the way, I think the other case arms in the case statement that has the
> sole caller of this function are never reached, no?
> 
> Back when you added the check in a74b170 (git-pull: disallow implicit
> merging to detached HEAD, 2007-01-15), $? referred to the error status of
> reading HEAD as a symbolic-ref so the check did make sense, but cd67e4d
> (Teach 'git pull' about --rebase, 2007-11-28) made a stupid mistake that
> nobody noticed.

Hmm. I'm not sure. I don't see how $? could not be zero, though, because the last thing we run is a subshell with sed and tr. But beyond that, we actually handle the detached case in error_on_no_merge_candidates already. So I think that case statement can simply be collapsed to the first case.

-Peff
Previous: Junio C HamanoNext: Jeff King
Message 22 of 28 in “Confusing git pull error message”
  1. John TapsellSep 12, 2009
  2. Jeff KingSep 12, 2009
  3. John TapsellSep 12, 2009
  4. Jeff KingSep 12, 2009
  5. Sverre RabbelierSep 12, 2009
  6. Jeff KingSep 12, 2009
  7. Sverre RabbelierSep 12, 2009
  8. Junio C HamanoSep 13, 2009
  9. Jeff KingSep 13, 2009
  10. Junio C HamanoSep 13, 2009
  11. Jeff KingSep 13, 2009
  12. Junio C HamanoSep 13, 2009
  13. John TapsellSep 13, 2009
  14. Junio C HamanoSep 13, 2009
  15. Junio C HamanoSep 13, 2009
  16. Jeff KingSep 13, 2009
  17. Jeff KingSep 14, 2009
  18. Johannes SixtOct 5, 2009
  19. Jeff KingOct 5, 2009
  20. Johannes SixtOct 5, 2009
  21. Junio C HamanoOct 5, 2009
  22. Jeff KingOct 5, 2009
  23. Jeff KingOct 5, 2009
  24. Nanako ShiraishiOct 8, 2009
  25. Junio C HamanoOct 9, 2009
  26. Junio C HamanoOct 10, 2009
  27. Junio C HamanoOct 5, 2009
  28. Jeff KingOct 5, 2009

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.