aboutsummaryrefslogtreecommitdiff
path: root/t/t2001-checkout-cache-clash.sh
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2013-06-07 22:53:28 +0200
committerJunio C Hamano <gitster@pobox.com>2013-06-07 15:01:45 -0700
commit889c6f0e4d637223e0517d000eedad39b173d8a2 (patch)
treed21550794a99df816ecc0a580d14545ee5c12acf /t/t2001-checkout-cache-clash.sh
parent9ce415d972a04df4bfceaad0fab8eaea9a66997e (diff)
downloadgit-889c6f0e4d637223e0517d000eedad39b173d8a2.tar.gz
git-889c6f0e4d637223e0517d000eedad39b173d8a2.tar.xz
tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
There are many instances where the treatment of symbolic links in the object model and the algorithms are tested, but where it is not necessary to actually have a symbolic link in the worktree. Make adjustments to the tests and remove the SYMLINKS prerequisite when appropriate in trivial cases, where "trivial" means: - merely a replacement of 'ln -s a b && git add b' by test_ln_s_add is needed; - a test for symbolic link on the file system can be split off (and remains protected by SYMLINKS); - existing code is equivalent to test_ln_s_add. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2001-checkout-cache-clash.sh')
-rwxr-xr-xt/t2001-checkout-cache-clash.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t2001-checkout-cache-clash.sh b/t/t2001-checkout-cache-clash.sh
index 98aa73e82..1fc8e634b 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)'