t5305: move cleanup into test block
authorJeff King <peff@peff.net>
Mon, 5 Sep 2016 21:52:10 +0000 (17:52 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Sep 2016 18:45:26 +0000 (11:45 -0700)
We usually try to avoid doing any significant actions
outside of test blocks. Although "rm -rf" is unlikely to
either fail or to generate output, moving these to the
point of use makes it more clear that they are part of the
overall setup of "clone.git".

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5305-include-tag.sh
index f314ad50791142b42c5f2807b5f086bbe9e1caad..60184048c5273d21db2da235dc5555c3b9c6e972 100755 (executable)
@@ -25,7 +25,6 @@ test_expect_success setup '
        } >obj-list
 '
 
-rm -rf clone.git
 test_expect_success 'pack without --include-tag' '
        packname_1=$(git pack-objects \
                --window=0 \
@@ -33,6 +32,7 @@ test_expect_success 'pack without --include-tag' '
 '
 
 test_expect_success 'unpack objects' '
+       rm -rf clone.git &&
        (
                GIT_DIR=clone.git &&
                export GIT_DIR &&
@@ -51,7 +51,6 @@ test_expect_success 'check unpacked result (have commit, no tag)' '
        test_cmp list.expect list.actual
 '
 
-rm -rf clone.git
 test_expect_success 'pack with --include-tag' '
        packname_1=$(git pack-objects \
                --window=0 \
@@ -60,6 +59,7 @@ test_expect_success 'pack with --include-tag' '
 '
 
 test_expect_success 'unpack objects' '
+       rm -rf clone.git &&
        (
                GIT_DIR=clone.git &&
                export GIT_DIR &&