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

Re: bug related to branches using / in name

From
Jeff King <peff@peff.net>
Date
Jun 27, 2008, 03:04 UTC
Message-ID
<20080627030422.GB7144@sigill.intra.peff.net>
In-Reply-To
<20080627030245.GA7144@sigill.intra.peff.net>
On Thu, Jun 26, 2008 at 11:02:46PM -0400, Jeff King wrote:
Show 9 quoted lines
> So to summarize, the problem is that you have an old tracking branch
> "refs/remotes/sched" that exists on the client, but upstream has since
> removed it in favor of "sched/devel", which you are now trying to fetch.
> And of course there is a conflict, because of the ref naming rules.
> 
> This doesn't work seamlessly because git-fetch never removes old
> tracking branches, even if they have been deleted upstream. And normally
> there is no conflict; leaving the old branches means they don't
> disappear from under you.

BTW, you can get the opposite problem, too. If you have "refs/remotes/origin/foo/bar", and then the remote removes "foo/bar" in favor of "foo", you will have a conflict on fetch.

-Peff
Previous: Jeff KingNext: Simon Holm Thøgersen
Message 3 of 13 in “bug related to branches using / in name”
  1. Simon Holm ThøgersenJun 26, 2008
  2. Jeff KingJun 27, 2008
  3. Jeff KingJun 27, 2008
  4. Simon Holm ThøgersenJun 27, 2008
  5. Jeff KingJun 27, 2008
  6. fetch: report local storage errors in status tableJeff King, Jun 27, 2008
  7. Junio C HamanoJun 27, 2008
  8. Jeff KingJun 28, 2008
  9. 2/2 fetch: give a hint to the user when local refs fail to updateJeff King, Jun 27, 2008
  10. Junio C HamanoJun 27, 2008
  11. Jeff KingJun 28, 2008
  12. Junio C HamanoJun 28, 2008
  13. Jakub NarebskiJun 28, 2008

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.