aboutsummaryrefslogtreecommitdiff
path: root/t/t2007-checkout-symlink.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-13 11:20:57 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-13 11:20:57 -0700
commita9f80f3dd4dc68ec6e9898805ccac2bb44c563ab (patch)
tree4e0151e5b5796b6aa1494172c1edab5852a698ea /t/t2007-checkout-symlink.sh
parentde8c359786ac9ea825eca59403ef15c961e8caae (diff)
parent621fd7a287dbb9279e18a6932c7037a8c4d224ef (diff)
downloadgit-a9f80f3dd4dc68ec6e9898805ccac2bb44c563ab.tar.gz
git-a9f80f3dd4dc68ec6e9898805ccac2bb44c563ab.tar.xz
Merge branch 'ab/test-cleanup'
* ab/test-cleanup: Turn setup code in t2007-checkout-symlink.sh into a test Move t6000lib.sh to lib-*
Diffstat (limited to 't/t2007-checkout-symlink.sh')
-rwxr-xr-xt/t2007-checkout-symlink.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t2007-checkout-symlink.sh b/t/t2007-checkout-symlink.sh
index 20f33436d..27e2127af 100755
--- a/t/t2007-checkout-symlink.sh
+++ b/t/t2007-checkout-symlink.sh
@@ -44,8 +44,10 @@ test_expect_success 'switch from symlink to dir' '
'
-rm -fr frotz xyzzy nitfol &&
-git checkout -f master || exit
+test_expect_success 'Remove temporary directories & switch to master' '
+ rm -fr frotz xyzzy nitfol &&
+ git checkout -f master
+'
test_expect_success 'switch from dir to symlink' '