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

Re: [PATCH 4/5] Be more specific if upstream branch is not fetched

From
Jeff King <peff@peff.net>
Date
Apr 12, 2012, 20:40 UTC
Message-ID
<20120412204055.GA21018@sigill.intra.peff.net>
In-Reply-To
<7vd37dgevr.fsf@alter.siamese.dyndns.org>
On Thu, Apr 12, 2012 at 08:15:52AM -0700, Junio C Hamano wrote:
Show 17 quoted lines
> In other words, the fetch refspec could be without colon.  With
> 
> 	[remote "origin"]
> 		url = ...
>         	fetch = refs/heads/master
> 	[branch "master"]
>         	remote = origin
>                 merge = refs/heads/master
> 
> you can still say "git pull" without any other argument while on your
> "master" and it will do the right thing.  Actually, you do not even have
> to have remote.origin.fetch at all (branch.master.merge will be added to
> the set of refs to be fetched).
> 
> In such a case "master@{upstream}" does not (and should not) resolve to
> anything, and the reason is not because it is not "fetched", but as Peff
> said, because it is not "stored".

Exactly. That was the distinction I was trying to make, but you explained it much better.

-Peff
Previous: Junio C HamanoNext: Zbigniew Jędrzejewski-Szmek
Message 16 of 24 in “provide better error messages for @{upstream}”
  1. 0/5 provide better error messages for @{upstream}Zbigniew Jędrzejewski-Szmek, Apr 11, 2012
  2. 1/5 t1507: add additional tests for @{upstream}Zbigniew Jędrzejewski-Szmek, Apr 11, 2012
  3. Junio C HamanoApr 11, 2012
  4. Junio C HamanoApr 11, 2012
  5. Zbigniew Jędrzejewski-SzmekApr 11, 2012
  6. Matthieu MoyApr 11, 2012
  7. Zbigniew Jędrzejewski-SzmekApr 11, 2012
  8. 2/5 Provide branch name in error message when using @{u}Zbigniew Jędrzejewski-Szmek, Apr 11, 2012
  9. Junio C HamanoApr 11, 2012
  10. Zbigniew Jędrzejewski-SzmekApr 11, 2012
  11. 3/5 Provide better message for barnhc_wiht_tpyo@{u}Zbigniew Jędrzejewski-Szmek, Apr 11, 2012
  12. 4/5 Be more specific if upstream branch is not fetchedZbigniew Jędrzejewski-Szmek, Apr 11, 2012
  13. Jeff KingApr 12, 2012
  14. Zbigniew Jędrzejewski-SzmekApr 12, 2012
  15. Junio C HamanoApr 12, 2012
  16. Jeff KingApr 12, 2012
  17. 0/5 provide better error messages for @{upstream}Zbigniew Jędrzejewski-Szmek, Apr 14, 2012
  18. 1/5 t1507: add tests to document @{upstream} behaviourZbigniew Jędrzejewski-Szmek, Apr 14, 2012
  19. 2/5 Provide branch name in error message when using @{u}Zbigniew Jędrzejewski-Szmek, Apr 14, 2012
  20. 3/5 Provide better message for barnhc_wiht_tpyo@{u}Zbigniew Jędrzejewski-Szmek, Apr 14, 2012
  21. 4/5 Be more specific if upstream branch is not trackedZbigniew Jędrzejewski-Szmek, Apr 14, 2012
  22. 5/5 i18n: mark @{upstream} error messages for translationZbigniew Jędrzejewski-Szmek, Apr 14, 2012
  23. Jeff KingApr 14, 2012
  24. 5/5 i18n: mark @{upstream} error messages for translationZbigniew Jędrzejewski-Szmek, Apr 11, 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.