diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-29 20:22:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-29 20:24:28 -0700 |
| commit | b6986d8a75812a003a1623e0f0dff93c4a026b44 (patch) | |
| tree | 310d937efb0c261707bd5577f696270c9b1d068f /t | |
| parent | 77716755cbdf970fa0814a5f77c884b1f17693de (diff) | |
| download | git-b6986d8a75812a003a1623e0f0dff93c4a026b44.tar.gz git-b6986d8a75812a003a1623e0f0dff93c4a026b44.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6035-merge-dir-to-symlink.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh index ba90fc53e..a0ddf1e0f 100755 --- a/t/t6035-merge-dir-to-symlink.sh +++ b/t/t6035-merge-dir-to-symlink.sh @@ -17,7 +17,7 @@ test_expect_success 'create a commit where dir a/b changed to symlink' ' git commit -m "dir to symlink" ' -test_expect_failure 'keep a/b-2/c/d across checkout' ' +test_expect_success 'keep a/b-2/c/d across checkout' ' git checkout HEAD^0 && git reset --hard master && git rm --cached a/b && |