summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-12 08:04:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-12 09:22:53 (GMT)
commitec0603e13c4e33c3a1501fe16f576db9aff1701a (patch)
tree2ca7b64232eb410bd24d679a422263154392bb43 /git-gui/git-gui.sh
parent1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5 (diff)
downloadgit-ec0603e13c4e33c3a1501fe16f576db9aff1701a.zip
git-ec0603e13c4e33c3a1501fe16f576db9aff1701a.tar.gz
git-ec0603e13c4e33c3a1501fe16f576db9aff1701a.tar.bz2
Teach read-tree 2-way merge to ignore intermediate symlinks
Earlier in 16a4c61, we taught "read-tree -m -u" not to be confused when switching from a branch that has a path frotz/filfre to another branch that has a symlink frotz that points at xyzzy/ directory. The fix was incomplete in that it was still confused when coming back (i.e. switching from a branch with frotz -> xyzzy/ to another branch with frotz/filfre). This fix is rather expensive in that for a path that is created we would need to see if any of the leading component of that path exists as a symbolic link in the filesystem (in which case, we know that path itself does not exist, and the fact we already decided to check it out tells us that in the index we already know that symbolic link is going away as there is no D/F conflict). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/git-gui.sh')
0 files changed, 0 insertions, 0 deletions