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/t2004-checkout-cache-temp.sh | |
| parent | 6aeb74ec89272be317f66869fde7c5144d528d5e (diff) | |
| parent | 70836a6f8b71a945f074fc796c4241c2183b83a2 (diff) | |
| download | git-c0266ed2759fa1838384c37faa6d7264edaaf04b.tar.gz | |
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/t2004-checkout-cache-temp.sh')
| -rwxr-xr-x | t/t2004-checkout-cache-temp.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh index 0f4b2896af..f171a5578b 100755 --- a/t/t2004-checkout-cache-temp.sh +++ b/t/t2004-checkout-cache-temp.sh @@ -194,11 +194,10 @@ test_expect_success \ test $(cat ../$s1) = tree1asubdir/path5) )' -test_expect_success SYMLINKS \ +test_expect_success \ 'checkout --temp symlink' ' rm -f path* .merge_* out .git/index && -ln -s b a && -git update-index --add a && +test_ln_s_add b a && t4=$(git write-tree) && rm -f .git/index && git read-tree $t4 && |