undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5305: simplify packname handling

Browse Source 
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>
This commit is contained in:
Jeff King 2016-09-05 17:52:22 -04:00 committed by Junio C Hamano
parent 948a7fd242
commit ab5178356c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
t/t5305-include-tag.sh
View File

@ -26,15 +26,15 @@ test_expect_success setup '
' '
test_expect_success 'pack without --include-tag' ' test_expect_success 'pack without --include-tag' '
packname_1=$(git pack-objects \ packname=$(git pack-objects \
--window=0 \ --window=0 \
test-1 <obj-list) test-no-include <obj-list)
' '
test_expect_success 'unpack objects' ' test_expect_success 'unpack objects' '
rm -rf clone.git && rm -rf clone.git &&
git init 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)' ' 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' ' test_expect_success 'pack with --include-tag' '
packname_1=$(git pack-objects \ packname=$(git pack-objects \
--window=0 \ --window=0 \
--include-tag \ --include-tag \
test-2 <obj-list) test-include <obj-list)
' '
test_expect_success 'unpack objects' ' test_expect_success 'unpack objects' '
rm -rf clone.git && rm -rf clone.git &&
git init 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)' ' test_expect_success 'check unpacked result (have commit, have tag)' '