Skip to content

Commit a80297f

Browse files
committed
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>
1 parent ef8a9b7 commit a80297f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

t/t9902-completion.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -542,37 +542,37 @@ test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '
542542
'
543543

544544
read -r -d "" refs <<-\EOF
545+
main
545546
maint
546-
master
547547
next
548548
seen
549549
EOF
550550

551551
test_expect_success '__gitcomp_nl - trailing space' '
552552
test_gitcomp_nl "m" "$refs" <<-EOF
553+
main Z
553554
maint Z
554-
master Z
555555
EOF
556556
'
557557

558558
test_expect_success '__gitcomp_nl - prefix' '
559559
test_gitcomp_nl "--fixup=m" "$refs" "--fixup=" "m" <<-EOF
560+
--fixup=main Z
560561
--fixup=maint Z
561-
--fixup=master Z
562562
EOF
563563
'
564564

565565
test_expect_success '__gitcomp_nl - suffix' '
566566
test_gitcomp_nl "branch.ma" "$refs" "branch." "ma" "." <<-\EOF
567+
branch.main.Z
567568
branch.maint.Z
568-
branch.master.Z
569569
EOF
570570
'
571571

572572
test_expect_success '__gitcomp_nl - no suffix' '
573573
test_gitcomp_nl "ma" "$refs" "" "ma" "" <<-\EOF
574+
mainZ
574575
maintZ
575-
masterZ
576576
EOF
577577
'
578578

0 commit comments

Comments
 (0)