diff options
| author |   Johannes Sixt <j6t@kdbg.org> | 2011-04-12 08:41:19 +0200 |
|---|---|---|
| committer |   Junio C Hamano <gitster@pobox.com> | 2011-04-12 00:03:54 -0700 |
| commit | 9973d9329b71556178ef32b4f8cfedab009a18d8 (patch) | |
| tree | e5abcb10839691c67d3a235c2e5ea8697cd60b03 | |
| parent | do not overwrite untracked symlinks (diff) | |
| download | git-9973d9329b71556178ef32b4f8cfedab009a18d8.tar.xz git-9973d9329b71556178ef32b4f8cfedab009a18d8.zip | |
t2021: mark a test as fixed
The failure was fixed by the previous commit.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 27db2ad5298..5da63e9fa26 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" && |