@matheusbsbs / matheus-bagliano / commits / ab5178356c

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>

Jeff King committed Sep 5, 2016 at 17:52 UTC ab5178356cc47ea9f1725993d45941d7c41fa471

1 file changed +6 -6

t/t5305-include-tag.sh

+6 -6

@@ -26,15 +26,15 @@ test_expect_success setup '

26 '

28 test_expect_success 'pack without --include-tag' '

29 - packname_1=$(git pack-objects \

29 + packname=$(git pack-objects \

30 --window=0 \

31 - test-1 <obj-list)

31 + test-no-include <obj-list)

32 '

34 test_expect_success 'unpack objects' '

35 rm -rf clone.git &&

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 '

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 '

47 test_expect_success 'pack with --include-tag' '

48 - packname_1=$(git pack-objects \

48 + packname=$(git pack-objects \

49 --window=0 \

50 --include-tag \

51 - test-2 <obj-list)

51 + test-include <obj-list)

52 '

54 test_expect_success 'unpack objects' '

55 rm -rf clone.git &&

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 '

60 test_expect_success 'check unpacked result (have commit, have tag)' '