From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri, 7 May 2010 19:37:03 +0000 (+0000)
Subject: Turn setup code in t2007-checkout-symlink.sh into a test
X-Git-Tag: v1.7.2-rc0~86^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=621fd7a287dbb9279e18a6932c7037a8c4d224ef;p=git.git

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>
---

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' '