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

From: Pierre Habouzit <madcoder@debian.org>
Date: Jul 4, 2007, 21:05 UTC
Message-ID: <20070704210559.GB13286@artemis.corp>
In-Reply-To: <7vabubhoxb.fsf@assigned-by-dhcp.cox.net>

On Wed, Jul 04, 2007 at 01:52:32PM -0700, Junio C Hamano wrote:

Show 16 quoted lines

> Pierre Habouzit <madcoder@debian.org> writes:
> 
> >   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 :)
> 
> Yeah, I think our handling of symlinks in both read-tree and
> merge-recursive codepath are Ok for symlinks at the leaf level
> but not for intermediate levels.  I think we have some patches
> in the recent git (post 1.5.1) to fix (perhaps some of) the
> issues, though.

  that was with the git in debian unstable, 1.5.2.3 actually.  I'll try
again with HEAD to see if that's fixed.

-- 
·O·  Pierre Habouzit
··O                                                madcoder@debian.org
OOO                                                http://www.madism.org