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>
Ævar Arnfjörð Bjarmason committed
Feb 9, 2018 at 20:32 UTC
e249ce0ccdb5c57f45a88daa25d24c5b602ee6e9
1 file changed
+50
-42
t/t5510-fetch.sh
+50
-42
@@ -562,10 +562,12 @@ test_configured_prune () {
562
test_configured_prune_type () {
563
fetch_prune=$1
564
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
571
572
if test -z "$cmdline_setup"
573
then
@@ -590,14 +592,16 @@ test_configured_prune_type () {
592
cmdline="$new_cmdline"
593
fi
594
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" '
596
# make sure a newbranch is there in . and also in one
597
git branch -f newbranch &&
598
git tag -f newtag &&
599
(
600
cd one &&
601
test_unconfig fetch.prune &&
602
+ test_unconfig fetch.pruneTags &&
603
test_unconfig remote.origin.prune &&
604
+ test_unconfig remote.origin.pruneTags &&
605
git fetch '"$cmdline_setup"' &&
606
git rev-parse --verify refs/remotes/origin/newbranch &&
607
git rev-parse --verify refs/tags/newtag
@@ -612,7 +616,9 @@ test_configured_prune_type () {
616
cd one &&
617
git_fetch_c="" &&
618
set_config_tristate fetch.prune $fetch_prune &&
619
+ set_config_tristate fetch.pruneTags $fetch_prune_tags &&
620
set_config_tristate remote.origin.prune $remote_origin_prune &&
621
+ set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
622
623
if test "$mode" != "link"
624
then
@@ -641,57 +647,59 @@ test_configured_prune_type () {
647
648
# $1 config: fetch.prune
649
# $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:
655
#
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 \
661
"--prune origin refs/tags/*:refs/tags/*"
654
-test_configured_prune unset unset pruned pruned \
662
+test_configured_prune unset unset unset unset pruned pruned \
663
"--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
664
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"
668
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"
672
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"
676
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 \
681
"--prune origin refs/tags/*:refs/tags/*"
674
-test_configured_prune false false pruned pruned \
682
+test_configured_prune false false unset unset pruned pruned \
683
"--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
684
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"
688
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"
692
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"
696
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 \
701
"--prune origin refs/tags/*:refs/tags/*"
694
-test_configured_prune true true pruned pruned \
702
+test_configured_prune true true unset unset pruned pruned \
703
"--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
704
705
test_expect_success 'all boundary commits are excluded' '