diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-20 16:02:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-20 16:02:18 -0700 |
| commit | c0266ed2759fa1838384c37faa6d7264edaaf04b (patch) | |
| tree | fef5a3e38e75495e8a91881e9c8a1b35c9e536c1 /t/t2001-checkout-cache-clash.sh | |
| parent | Merge branch 'nd/make-wildmatch-default' (diff) | |
| parent | t4011: remove SYMLINKS prerequisite (diff) | |
| download | tgif-c0266ed2759fa1838384c37faa6d7264edaaf04b.tar.xz | |
Merge branch 'js/test-ln-s-add'
Many tests that check the behaviour of symbolic links stored in the
index or the tree objects do not have to be skipped on a filesystem
that lack symbolic link support.
* js/test-ln-s-add:
t4011: remove SYMLINKS prerequisite
t6035: use test_ln_s_add to remove SYMLINKS prerequisite
t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
t3100: use test_ln_s_add to remove SYMLINKS prerequisite
t3030: use test_ln_s_add to remove SYMLINKS prerequisite
t0000: use test_ln_s_add to remove SYMLINKS prerequisite
tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
tests: introduce test_ln_s_add
t3010: modernize style
test-chmtime: Fix exit code on Windows
Diffstat (limited to 't/t2001-checkout-cache-clash.sh')
| -rwxr-xr-x | t/t2001-checkout-cache-clash.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t2001-checkout-cache-clash.sh b/t/t2001-checkout-cache-clash.sh index 98aa73e823..1fc8e634b7 100755 --- a/t/t2001-checkout-cache-clash.sh +++ b/t/t2001-checkout-cache-clash.sh @@ -59,10 +59,9 @@ test_expect_success \ 'git read-tree -m $tree1 && git checkout-index -f -a' test_debug 'show_files $tree1' -test_expect_success SYMLINKS \ - 'git update-index --add a symlink.' \ - 'ln -s path0 path1 && - git update-index --add path1' +test_expect_success \ + 'add a symlink' \ + 'test_ln_s_add path0 path1' test_expect_success \ 'writing tree out with git write-tree' \ 'tree3=$(git write-tree)' |