diff options
Diffstat (limited to 't/t1001-checkout-cache.sh')
| -rwxr-xr-x | t/t1001-checkout-cache.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/t/t1001-checkout-cache.sh b/t/t1001-checkout-cache.sh index 73d92b219b..f0e3d1d8c3 100755 --- a/t/t1001-checkout-cache.sh +++ b/t/t1001-checkout-cache.sh @@ -76,15 +76,12 @@ test_expect_success \ 'git-read-tree $tree2 && git-checkout-cache -f -a' test_debug show_files $tree2 -if test ! -h path0 && test -d path0 && - test ! -h path1 && test -d path1 && - test ! -h path0/file0 && test -f path0/file0 && - test ! -h path1/file1 && test -f path1/file1 -then - test_ok "checked out correctly." -else - test_failure "did not check out correctly." -fi +test_expect_success \ + 'checking out conflicting path with -f' \ + 'test ! -h path0 && test -d path0 && + test ! -h path1 && test -d path1 && + test ! -h path0/file0 && test -f path0/file0 && + test ! -h path1/file1 && test -f path1/file1' test_done |