fetch tests: re-arrange arguments for future readability
Re-arrange the arguments to the test_configured_prune() function used in this test to pass the arguments to --fetch last. A subsequent change will test for more elaborate fetch arguments, including long refspecs. It'll be more readable to be able to wrap those on a new line of their own. 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
bf16ab795574c27ffa0fe180cede2d355de41619
1 file changed
+44
-38
t/t5510-fetch.sh
+44
-38
@@ -551,10 +551,10 @@ set_config_tristate () {
551
test_configured_prune () {
552
fetch_prune=$1
553
remote_origin_prune=$2
554
- cmdline=$3
555
- expected_branch=$4
554
+ expected_branch=$3
555
+ cmdline=$4
556
557
- test_expect_success "prune fetch.prune=$1 remote.origin.prune=$2${3:+ $3}; branch:$4" '
557
+ test_expect_success "prune fetch.prune=$1 remote.origin.prune=$2${4:+ $4}; branch:$3" '
558
# make sure a newbranch is there in . and also in one
559
git branch -f newbranch &&
560
(
@@ -587,41 +587,47 @@ test_configured_prune () {
587
'
588
}
589
590
-test_configured_prune unset unset "" kept
591
-test_configured_prune unset unset "--no-prune" kept
592
-test_configured_prune unset unset "--prune" pruned
593
-
594
-test_configured_prune false unset "" kept
595
-test_configured_prune false unset "--no-prune" kept
596
-test_configured_prune false unset "--prune" pruned
597
-
598
-test_configured_prune true unset "" pruned
599
-test_configured_prune true unset "--prune" pruned
600
-test_configured_prune true unset "--no-prune" kept
601
-
602
-test_configured_prune unset false "" kept
603
-test_configured_prune unset false "--no-prune" kept
604
-test_configured_prune unset false "--prune" pruned
605
-
606
-test_configured_prune false false "" kept
607
-test_configured_prune false false "--no-prune" kept
608
-test_configured_prune false false "--prune" pruned
609
-
610
-test_configured_prune true false "" kept
611
-test_configured_prune true false "--prune" pruned
612
-test_configured_prune true false "--no-prune" kept
613
-
614
-test_configured_prune unset true "" pruned
615
-test_configured_prune unset true "--no-prune" kept
616
-test_configured_prune unset true "--prune" pruned
617
-
618
-test_configured_prune false true "" pruned
619
-test_configured_prune false true "--no-prune" kept
620
-test_configured_prune false true "--prune" pruned
621
-
622
-test_configured_prune true true "" pruned
623
-test_configured_prune true true "--prune" pruned
624
-test_configured_prune true true "--no-prune" kept
590
+# $1 config: fetch.prune
591
+# $2 config: remote.<name>.prune
592
+# $3 expect: branch to be pruned?
593
+# $4 git-fetch $cmdline:
594
+#
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"
631
632
test_expect_success 'all boundary commits are excluded' '
633
test_commit base &&