summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-09-05 21:52:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-07 18:45:29 (GMT)
commitab5178356cc47ea9f1725993d45941d7c41fa471 (patch)
treec483105156ac5da99b593476e21a5d6257fc4404
parent948a7fd242a28e61e454f62001716af2c9d614b0 (diff)
downloadgit-ab5178356cc47ea9f1725993d45941d7c41fa471.zip
git-ab5178356cc47ea9f1725993d45941d7c41fa471.tar.gz
git-ab5178356cc47ea9f1725993d45941d7c41fa471.tar.bz2
t5305: simplify packname handling
We generate a series of packfiles test-1-$pack, test-2-$pack, with different properties and then examine them. However we always store the packname generated by pack-objects in the variable packname_1. This probably was meant to be packname_2 in the second test, but it turns out that it doesn't matter: once we are done with the first pack, we can just keep using the same $packname variable. So let's drop the confusing "_1" parameter. At the same time, let's give test-1 and test-2 more descriptive names, which can help keep them straight (note that we _could_ likewise overwrite the packfiles in each test, but by using separate filenames, we are sure that test 2 does not accidentally use the packfile from test 1). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5305-include-tag.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t5305-include-tag.sh b/t/t5305-include-tag.sh
index 089a3e9..e3c6c62 100755
--- a/t/t5305-include-tag.sh
+++ b/t/t5305-include-tag.sh
@@ -26,15 +26,15 @@ test_expect_success setup '
'
test_expect_success 'pack without --include-tag' '
- packname_1=$(git pack-objects \
+ packname=$(git pack-objects \
--window=0 \
- test-1 <obj-list)
+ test-no-include <obj-list)
'
test_expect_success 'unpack objects' '
rm -rf clone.git &&
git init clone.git &&
- git -C clone.git unpack-objects <test-1-${packname_1}.pack
+ git -C clone.git unpack-objects <test-no-include-${packname}.pack
'
test_expect_success 'check unpacked result (have commit, no tag)' '
@@ -45,16 +45,16 @@ test_expect_success 'check unpacked result (have commit, no tag)' '
'
test_expect_success 'pack with --include-tag' '
- packname_1=$(git pack-objects \
+ packname=$(git pack-objects \
--window=0 \
--include-tag \
- test-2 <obj-list)
+ test-include <obj-list)
'
test_expect_success 'unpack objects' '
rm -rf clone.git &&
git init clone.git &&
- git -C clone.git unpack-objects <test-2-${packname_1}.pack
+ git -C clone.git unpack-objects <test-include-${packname}.pack
'
test_expect_success 'check unpacked result (have commit, have tag)' '