aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-09-05 17:52:10 -0400
committerJunio C Hamano <gitster@pobox.com>2016-09-07 11:45:26 -0700
commit1962d9fbe3feeb888053d0c648e39b82870c4ef3 (patch)
tree0911b665941b90a7880d1e3c1e327b5097847064
parente0c1ceafc5bece92d35773a75fff59497e1d9bd5 (diff)
downloadgit-1962d9fbe3feeb888053d0c648e39b82870c4ef3.tar.gz
git-1962d9fbe3feeb888053d0c648e39b82870c4ef3.tar.xz
t5305: move cleanup into test block
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>
-rwxr-xr-xt/t5305-include-tag.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5305-include-tag.sh b/t/t5305-include-tag.sh
index f314ad507..60184048c 100755
--- a/t/t5305-include-tag.sh
+++ b/t/t5305-include-tag.sh
@@ -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 &&