Skip to content

Commit e249ce0

Browse files
avargitster
avar
authored and
gitster
committed
fetch tests: add scaffolding for the new fetch.pruneTags
The fetch.pruneTags configuration doesn't exist yet, but will be added in a subsequent commit. Since testing for it requires adding new parameters to the test_configured_prune function it's easier to review this patch first to assert that no functional changes are introduced yet. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 627a129 commit e249ce0

File tree

1 file changed

+50
-42
lines changed

1 file changed

+50
-42
lines changed

‎t/t5510-fetch.sh‎

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -562,10 +562,12 @@ test_configured_prune () {
562562
test_configured_prune_type () {
563563
fetch_prune=$1
564564
remote_origin_prune=$2
565-
expected_branch=$3
566-
expected_tag=$4
567-
cmdline=$5
568-
mode=$6
565+
fetch_prune_tags=$3
566+
remote_origin_prune_tags=$4
567+
expected_branch=$5
568+
expected_tag=$6
569+
cmdline=$7
570+
mode=$8
569571

570572
if test -z "$cmdline_setup"
571573
then
@@ -590,14 +592,16 @@ test_configured_prune_type () {
590592
cmdline="$new_cmdline"
591593
fi
592594

593-
test_expect_success "$mode prune fetch.prune=$1 remote.origin.prune=$2${5:+ $5}; branch:$3 tag:$4" '
595+
test_expect_success "$mode prune fetch.prune=$1 remote.origin.prune=$2 fetch.pruneTags=$3 remote.origin.pruneTags=$4${7:+ $7}; branch:$5 tag:$6" '
594596
# make sure a newbranch is there in . and also in one
595597
git branch -f newbranch &&
596598
git tag -f newtag &&
597599
(
598600
cd one &&
599601
test_unconfig fetch.prune &&
602+
test_unconfig fetch.pruneTags &&
600603
test_unconfig remote.origin.prune &&
604+
test_unconfig remote.origin.pruneTags &&
601605
git fetch '"$cmdline_setup"' &&
602606
git rev-parse --verify refs/remotes/origin/newbranch &&
603607
git rev-parse --verify refs/tags/newtag
@@ -612,7 +616,9 @@ test_configured_prune_type () {
612616
cd one &&
613617
git_fetch_c="" &&
614618
set_config_tristate fetch.prune $fetch_prune &&
619+
set_config_tristate fetch.pruneTags $fetch_prune_tags &&
615620
set_config_tristate remote.origin.prune $remote_origin_prune &&
621+
set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
616622
617623
if test "$mode" != "link"
618624
then
@@ -641,57 +647,59 @@ test_configured_prune_type () {
641647

642648
# $1 config: fetch.prune
643649
# $2 config: remote.<name>.prune
644-
# $3 expect: branch to be pruned?
645-
# $4 expect: tag to be pruned?
646-
# $5 git-fetch $cmdline:
650+
# $3 config: fetch.pruneTags
651+
# $4 config: remote.<name>.pruneTags
652+
# $5 expect: branch to be pruned?
653+
# $6 expect: tag to be pruned?
654+
# $7 git-fetch $cmdline:
647655
#
648-
# $1 $2 $3 $4 $5
649-
test_configured_prune unset unset kept kept ""
650-
test_configured_prune unset unset kept kept "--no-prune"
651-
test_configured_prune unset unset pruned kept "--prune"
652-
test_configured_prune unset unset kept pruned \
656+
# $1 $2 $3 $4 $5 $6 $7
657+
test_configured_prune unset unset unset unset kept kept ""
658+
test_configured_prune unset unset unset unset kept kept "--no-prune"
659+
test_configured_prune unset unset unset unset pruned kept "--prune"
660+
test_configured_prune unset unset unset unset kept pruned \
653661
"--prune origin refs/tags/*:refs/tags/*"
654-
test_configured_prune unset unset pruned pruned \
662+
test_configured_prune unset unset unset unset pruned pruned \
655663
"--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
656664

657-
test_configured_prune false unset kept kept ""
658-
test_configured_prune false unset kept kept "--no-prune"
659-
test_configured_prune false unset pruned kept "--prune"
665+
test_configured_prune false unset unset unset kept kept ""
666+
test_configured_prune false unset unset unset kept kept "--no-prune"
667+
test_configured_prune false unset unset unset pruned kept "--prune"
660668

661-
test_configured_prune true unset pruned kept ""
662-
test_configured_prune true unset pruned kept "--prune"
663-
test_configured_prune true unset kept kept "--no-prune"
669+
test_configured_prune true unset unset unset pruned kept ""
670+
test_configured_prune true unset unset unset pruned kept "--prune"
671+
test_configured_prune true unset unset unset kept kept "--no-prune"
664672

665-
test_configured_prune unset false kept kept ""
666-
test_configured_prune unset false kept kept "--no-prune"
667-
test_configured_prune unset false pruned kept "--prune"
673+
test_configured_prune unset false unset unset kept kept ""
674+
test_configured_prune unset false unset unset kept kept "--no-prune"
675+
test_configured_prune unset false unset unset pruned kept "--prune"
668676

669-
test_configured_prune false false kept kept ""
670-
test_configured_prune false false kept kept "--no-prune"
671-
test_configured_prune false false pruned kept "--prune"
672-
test_configured_prune false false kept pruned \
677+
test_configured_prune false false unset unset kept kept ""
678+
test_configured_prune false false unset unset kept kept "--no-prune"
679+
test_configured_prune false false unset unset pruned kept "--prune"
680+
test_configured_prune false false unset unset kept pruned \
673681
"--prune origin refs/tags/*:refs/tags/*"
674-
test_configured_prune false false pruned pruned \
682+
test_configured_prune false false unset unset pruned pruned \
675683
"--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
676684

677-
test_configured_prune true false kept kept ""
678-
test_configured_prune true false pruned kept "--prune"
679-
test_configured_prune true false kept kept "--no-prune"
685+
test_configured_prune true false unset unset kept kept ""
686+
test_configured_prune true false unset unset pruned kept "--prune"
687+
test_configured_prune true false unset unset kept kept "--no-prune"
680688

681-
test_configured_prune unset true pruned kept ""
682-
test_configured_prune unset true kept kept "--no-prune"
683-
test_configured_prune unset true pruned kept "--prune"
689+
test_configured_prune unset true unset unset pruned kept ""
690+
test_configured_prune unset true unset unset kept kept "--no-prune"
691+
test_configured_prune unset true unset unset pruned kept "--prune"
684692

685-
test_configured_prune false true pruned kept ""
686-
test_configured_prune false true kept kept "--no-prune"
687-
test_configured_prune false true pruned kept "--prune"
693+
test_configured_prune false true unset unset pruned kept ""
694+
test_configured_prune false true unset unset kept kept "--no-prune"
695+
test_configured_prune false true unset unset pruned kept "--prune"
688696

689-
test_configured_prune true true pruned kept ""
690-
test_configured_prune true true pruned kept "--prune"
691-
test_configured_prune true true kept kept "--no-prune"
692-
test_configured_prune true true kept pruned \
697+
test_configured_prune true true unset unset pruned kept ""
698+
test_configured_prune true true unset unset pruned kept "--prune"
699+
test_configured_prune true true unset unset kept kept "--no-prune"
700+
test_configured_prune true true unset unset kept pruned \
693701
"--prune origin refs/tags/*:refs/tags/*"
694-
test_configured_prune true true pruned pruned \
702+
test_configured_prune true true unset unset pruned pruned \
695703
"--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
696704

697705
test_expect_success 'all boundary commits are excluded' '

0 commit comments

Comments
 (0)