git-checkout: be careful about untracked symlinks
commitb6986d8a75812a003a1623e0f0dff93c4a026b44
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2009 03:22:25 +0000 (29 20:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2009 03:24:28 +0000 (29 20:24 -0700)
tree310d937efb0c261707bd5577f696270c9b1d068f
parent77716755cbdf970fa0814a5f77c884b1f17693de
git-checkout: be careful about untracked symlinks

This fixes the case where an untracked symlink that points at a directory
with tracked paths confuses the checkout logic, demostrated in t6035.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
cache.h
entry.c
t/t6035-merge-dir-to-symlink.sh