diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-13 13:55:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-13 13:55:53 -0700 |
| commit | 302de7a685952cddd764bd3ccd427d0cd9e67fdf (patch) | |
| tree | b5c516b1ce294c475692fa7a9412220946b4d749 /t | |
| parent | 5fb41b883a5d0f9cbc4c6c693e6d84a8a5cee17e (diff) | |
| parent | 9973d9329b71556178ef32b4f8cfedab009a18d8 (diff) | |
| download | git-302de7a685952cddd764bd3ccd427d0cd9e67fdf.tar.gz git-302de7a685952cddd764bd3ccd427d0cd9e67fdf.tar.xz | |
Merge branch 'js/checkout-untracked-symlink' into maint
* js/checkout-untracked-symlink:
t2021: mark a test as fixed
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2021-checkout-overwrite.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2021-checkout-overwrite.sh b/t/t2021-checkout-overwrite.sh index 27db2ad52..5da63e9fa 100755 --- a/t/t2021-checkout-overwrite.sh +++ b/t/t2021-checkout-overwrite.sh @@ -39,7 +39,7 @@ test_expect_success SYMLINKS 'create a commit where dir a/b changed to symlink' git commit -m "dir to symlink" ' -test_expect_failure SYMLINKS 'checkout commit with dir must not remove untracked a/b' ' +test_expect_success SYMLINKS 'checkout commit with dir must not remove untracked a/b' ' git rm --cached a/b && git commit -m "un-track the symlink" && |