summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2010-05-07 19:37:03 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-07 21:36:38 -0700
commit621fd7a287dbb9279e18a6932c7037a8c4d224ef (patch)
treea923ab6ca42bc239622283dd19b35b792b609c3a
parentMove t6000lib.sh to lib-* (diff)
downloadtgif-621fd7a287dbb9279e18a6932c7037a8c4d224ef.tar.xz
Turn setup code in t2007-checkout-symlink.sh into a test
Previously the test would print to stdout which interfered with the TAP output. Now this scaffolding code is just a normal test. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-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 20f33436d0..27e2127afe 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' '