fetch tests: add a tag to be deleted to the pruning tests
Add a tag to be deleted to the fetch --prune tests. The tag is always kept for now, which is the expected behavior, but now I can add a test for tag pruning in a later commit. 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
ca3065e7e7bcb406043f8202ef672f884eeb925d
1 file changed
+53
-40
t/t5510-fetch.sh
+53
-40
@@ -552,21 +552,25 @@ test_configured_prune () {
552
fetch_prune=$1
553
remote_origin_prune=$2
554
expected_branch=$3
555
- cmdline=$4
555
+ expected_tag=$4
556
+ cmdline=$5
557
557
- test_expect_success "prune fetch.prune=$1 remote.origin.prune=$2${4:+ $4}; branch:$3" '
558
+ test_expect_success "prune fetch.prune=$1 remote.origin.prune=$2${5:+ $5}; branch:$3 tag:$4" '
559
# make sure a newbranch is there in . and also in one
560
git branch -f newbranch &&
561
+ git tag -f newtag &&
562
(
563
cd one &&
564
test_unconfig fetch.prune &&
565
test_unconfig remote.origin.prune &&
566
git fetch &&
565
- git rev-parse --verify refs/remotes/origin/newbranch
567
+ git rev-parse --verify refs/remotes/origin/newbranch &&
568
+ git rev-parse --verify refs/tags/newtag
569
) &&
570
571
# now remove it
572
git branch -d newbranch &&
573
+ git tag -d newtag &&
574
575
# then test
576
(
@@ -582,6 +586,14 @@ test_configured_prune () {
586
kept)
587
git rev-parse --verify refs/remotes/origin/newbranch
588
;;
589
+ esac &&
590
+ case "$expected_tag" in
591
+ pruned)
592
+ test_must_fail git rev-parse --verify refs/tags/newtag
593
+ ;;
594
+ kept)
595
+ git rev-parse --verify refs/tags/newtag
596
+ ;;
597
esac
598
)
599
'
@@ -590,44 +602,45 @@ test_configured_prune () {
602
# $1 config: fetch.prune
603
# $2 config: remote.<name>.prune
604
# $3 expect: branch to be pruned?
593
-# $4 git-fetch $cmdline:
605
+# $4 expect: tag to be pruned?
606
+# $5 git-fetch $cmdline:
607
#
595
-# $1 $2 $3 $4
596
-test_configured_prune unset unset kept ""
597
-test_configured_prune unset unset kept "--no-prune"
598
-test_configured_prune unset unset pruned "--prune"
599
-
600
-test_configured_prune false unset kept ""
601
-test_configured_prune false unset kept "--no-prune"
602
-test_configured_prune false unset pruned "--prune"
603
-
604
-test_configured_prune true unset pruned ""
605
-test_configured_prune true unset pruned "--prune"
606
-test_configured_prune true unset kept "--no-prune"
607
-
608
-test_configured_prune unset false kept ""
609
-test_configured_prune unset false kept "--no-prune"
610
-test_configured_prune unset false pruned "--prune"
611
-
612
-test_configured_prune false false kept ""
613
-test_configured_prune false false kept "--no-prune"
614
-test_configured_prune false false pruned "--prune"
615
-
616
-test_configured_prune true false kept ""
617
-test_configured_prune true false pruned "--prune"
618
-test_configured_prune true false kept "--no-prune"
619
-
620
-test_configured_prune unset true pruned ""
621
-test_configured_prune unset true kept "--no-prune"
622
-test_configured_prune unset true pruned "--prune"
623
-
624
-test_configured_prune false true pruned ""
625
-test_configured_prune false true kept "--no-prune"
626
-test_configured_prune false true pruned "--prune"
627
-
628
-test_configured_prune true true pruned ""
629
-test_configured_prune true true pruned "--prune"
630
-test_configured_prune true true kept "--no-prune"
608
+# $1 $2 $3 $4 $5
609
+test_configured_prune unset unset kept kept ""
610
+test_configured_prune unset unset kept kept "--no-prune"
611
+test_configured_prune unset unset pruned kept "--prune"
612
+
613
+test_configured_prune false unset kept kept ""
614
+test_configured_prune false unset kept kept "--no-prune"
615
+test_configured_prune false unset pruned kept "--prune"
616
+
617
+test_configured_prune true unset pruned kept ""
618
+test_configured_prune true unset pruned kept "--prune"
619
+test_configured_prune true unset kept kept "--no-prune"
620
+
621
+test_configured_prune unset false kept kept ""
622
+test_configured_prune unset false kept kept "--no-prune"
623
+test_configured_prune unset false pruned kept "--prune"
624
+
625
+test_configured_prune false false kept kept ""
626
+test_configured_prune false false kept kept "--no-prune"
627
+test_configured_prune false false pruned kept "--prune"
628
+
629
+test_configured_prune true false kept kept ""
630
+test_configured_prune true false pruned kept "--prune"
631
+test_configured_prune true false kept kept "--no-prune"
632
+
633
+test_configured_prune unset true pruned kept ""
634
+test_configured_prune unset true kept kept "--no-prune"
635
+test_configured_prune unset true pruned kept "--prune"
636
+
637
+test_configured_prune false true pruned kept ""
638
+test_configured_prune false true kept kept "--no-prune"
639
+test_configured_prune false true pruned kept "--prune"
640
+
641
+test_configured_prune true true pruned kept ""
642
+test_configured_prune true true pruned kept "--prune"
643
+test_configured_prune true true kept kept "--no-prune"
644
645
test_expect_success 'all boundary commits are excluded' '
646
test_commit base &&