Skip to content

Commit

Permalink
t5305: move cleanup into test block
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
peff authored and gitster committed Sep 7, 2016
1 parent e0c1cea commit 1962d9f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions t/t5305-include-tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ test_expect_success setup '
} >obj-list
'

rm -rf clone.git
test_expect_success 'pack without --include-tag' '
packname_1=$(git pack-objects \
--window=0 \
test-1 <obj-list)
'

test_expect_success 'unpack objects' '
rm -rf clone.git &&
(
GIT_DIR=clone.git &&
export GIT_DIR &&
Expand All @@ -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 \
Expand All @@ -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 &&
Expand Down

0 comments on commit 1962d9f

Please sign in to comment.