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

Re: git pull fails

From
Petr Baudis <pasky@suse.cz>
Date
Mar 29, 2006, 00:24 UTC
Message-ID
<20060329002415.GG27689@pasky.or.cz>
In-Reply-To
<20060329031136.e0389c00.tihirvon@gmail.com>

Dear diary, on Wed, Mar 29, 2006 at 02:11:36AM CEST, I got a letter where Timo Hirvonen <tihirvon@gmail.com> said that...

> Exactly.  Maybe git-fetch should abort only if it could not update the
> currently checked out branch?

That should _never_ be the case. Any modern porcelain shouldn't let you switch your current branch to a remote one, hopefully. It's just wrong. The supported setup is that you have a remote branch reflecting where the upstream is and a local branch reflecting where your current tree is, and you update your local branch by git-pull (or git-merge if you want to avoid fetching).

If your current branch would really be a remote branch and you simply git-fetched, your HEAD would change but not your working tree, and at that moment things would become very confusing. Cogito would start showing nonsensical stuff for cg-status and cg-diff (as well as git-diff-tree HEAD output), but your index would at least still be correct so I'm not sure how much attention do tools like git-diff pay to it, the level of messup would be proportional to that.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time.  I think
I have forgotten this before.
Previous: Junio C HamanoNext: Junio C Hamano
Message 8 of 10 in “git pull fails”
  1. Timo HirvonenMar 28, 2006
  2. Ralf BaechleMar 28, 2006
  3. Timo HirvonenMar 28, 2006
  4. Radoslaw SzkodzinskiMar 28, 2006
  5. Petr BaudisMar 28, 2006
  6. Timo HirvonenMar 29, 2006
  7. Junio C HamanoMar 29, 2006
  8. Petr BaudisMar 29, 2006
  9. Junio C HamanoMar 29, 2006
  10. Petr BaudisMar 29, 2006

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.