diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-12 00:05:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-12 00:05:50 -0700 |
| commit | 9db19414582fdb154384ff1ca457cbf9095fef48 (patch) | |
| tree | f4df277813e7f47071ef89189ba72754c2822c0a | |
| parent | 5dee1532e1c8e8eb31bfa437b5ff00ea0acb6f08 (diff) | |
| parent | 9973d9329b71556178ef32b4f8cfedab009a18d8 (diff) | |
| download | git-9db19414582fdb154384ff1ca457cbf9095fef48.tar.gz | |
Merge branch 'js/checkout-untracked-symlink'
* js/checkout-untracked-symlink:
t2021: mark a test as fixed
| -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 27db2ad529..5da63e9fa2 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" && |