t5305: simplify packname handling

peff · gitster · commit ab5178356cc4 · 2016-09-07T11:45:29.000-07:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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)' '

Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,15 @@ test_expect_success setup '`
`26`	`26`	`'`
`27`	`27`
`28`	`28`	`test_expect_success 'pack without --include-tag' '`
`29`		`- packname_1=$(git pack-objects \`
	`29`	`+ packname=$(git pack-objects \`
`30`	`30`	`--window=0 \`
`31`		`- test-1 <obj-list)`
	`31`	`+ test-no-include <obj-list)`
`32`	`32`	`'`
`33`	`33`
`34`	`34`	`test_expect_success 'unpack objects' '`
`35`	`35`	`rm -rf clone.git &&`
`36`	`36`	`git init clone.git &&`
`37`		`- git -C clone.git unpack-objects <test-1-${packname_1}.pack`
	`37`	`+ git -C clone.git unpack-objects <test-no-include-${packname}.pack`
`38`	`38`	`'`
`39`	`39`
`40`	`40`	`test_expect_success 'check unpacked result (have commit, no tag)' '`
`@@ -45,16 +45,16 @@ test_expect_success 'check unpacked result (have commit, no tag)' '`
`45`	`45`	`'`
`46`	`46`
`47`	`47`	`test_expect_success 'pack with --include-tag' '`
`48`		`- packname_1=$(git pack-objects \`
	`48`	`+ packname=$(git pack-objects \`
`49`	`49`	`--window=0 \`
`50`	`50`	`--include-tag \`
`51`		`- test-2 <obj-list)`
	`51`	`+ test-include <obj-list)`
`52`	`52`	`'`
`53`	`53`
`54`	`54`	`test_expect_success 'unpack objects' '`
`55`	`55`	`rm -rf clone.git &&`
`56`	`56`	`git init clone.git &&`
`57`		`- git -C clone.git unpack-objects <test-2-${packname_1}.pack`
	`57`	`+ git -C clone.git unpack-objects <test-include-${packname}.pack`
`58`	`58`	`'`
`59`	`59`
`60`	`60`	`test_expect_success 'check unpacked result (have commit, have tag)' '`