t9902: avoid using the branch name `master`
The completion tests used that name unnecessarily, and it is a non-inclusive term, so let's avoid using it here. Since three of the touched test cases make use of the fact that two of the branch names (`master` and `maint`) start with the same letter (or even with the same two letters), we choose to replace the use of `master` by a name that also has that property: `main`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Sep 26, 2020 at 21:04 UTC
f33f2d3d54c12462701ea01e81da45e63e2c3087
1 file changed
+5
-5
t/t9902-completion.sh
+5
-5
@@ -542,37 +542,37 @@ test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '
542
'
543
544
read -r -d "" refs <<-\EOF
545
+main
546
maint
546
-master
547
next
548
seen
549
EOF
550
551
test_expect_success '__gitcomp_nl - trailing space' '
552
test_gitcomp_nl "m" "$refs" <<-EOF
553
+ main Z
554
maint Z
554
- master Z
555
EOF
556
'
557
558
test_expect_success '__gitcomp_nl - prefix' '
559
test_gitcomp_nl "--fixup=m" "$refs" "--fixup=" "m" <<-EOF
560
+ --fixup=main Z
561
--fixup=maint Z
561
- --fixup=master Z
562
EOF
563
'
564
565
test_expect_success '__gitcomp_nl - suffix' '
566
test_gitcomp_nl "branch.ma" "$refs" "branch." "ma" "." <<-\EOF
567
+ branch.main.Z
568
branch.maint.Z
568
- branch.master.Z
569
EOF
570
'
571
572
test_expect_success '__gitcomp_nl - no suffix' '
573
test_gitcomp_nl "ma" "$refs" "" "ma" "" <<-\EOF
574
+ mainZ
575
maintZ
575
- masterZ
576
EOF
577
'
578