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

[BUG (or misfeature?)] git checkout and symlinks

From
Pierre Habouzit <madcoder@debian.org>
Date
Jul 4, 2007, 20:35 UTC
Message-ID
<20070704203541.GA13286@artemis.corp>
  if in a branch [branch1] you track the file: dir1/file1.c
and in the branch [branch2] you track elsewhere/file1.c and dir1 be
symlink on elsewhere, then it's not possible to checkout the branch
[branch1] if your previous checkout was [branch2]. You have to manually
remove the symlink `dir1` else git complains that checkouting branch1
would overwrite dir1/file1.c.
  I'm not sure how to fix this, and it's quite painful actually :)
-- 
·O·  Pierre Habouzit
··O                                                madcoder@debian.org
OOO                                                http://www.madism.org
Next: Junio C Hamano
Message 1 of 11 in “[BUG (or misfeature?)] git checkout and symlinks”
  1. Pierre HabouzitJul 4, 2007
  2. Junio C HamanoJul 4, 2007
  3. Pierre HabouzitJul 4, 2007
  4. Pierre HabouzitJul 4, 2007
  5. Teach read-tree 2-way merge to ignore intermediate symlinksJunio C Hamano, Jul 12, 2007
  6. git-log --follow?Junio C Hamano, Jul 12, 2007
  7. Johannes SchindelinJul 12, 2007
  8. Linus TorvaldsJul 12, 2007
  9. Junio C HamanoJul 12, 2007
  10. Linus TorvaldsJul 12, 2007
  11. Pierre HabouzitJul 12, 2007

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.