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>
This commit is contained in:
parent
b6211b89eb
commit
f33f2d3d54
@ -542,37 +542,37 @@ test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '
|
|||||||
'
|
'
|
||||||
|
|
||||||
read -r -d "" refs <<-\EOF
|
read -r -d "" refs <<-\EOF
|
||||||
|
main
|
||||||
maint
|
maint
|
||||||
master
|
|
||||||
next
|
next
|
||||||
seen
|
seen
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
test_expect_success '__gitcomp_nl - trailing space' '
|
test_expect_success '__gitcomp_nl - trailing space' '
|
||||||
test_gitcomp_nl "m" "$refs" <<-EOF
|
test_gitcomp_nl "m" "$refs" <<-EOF
|
||||||
|
main Z
|
||||||
maint Z
|
maint Z
|
||||||
master Z
|
|
||||||
EOF
|
EOF
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success '__gitcomp_nl - prefix' '
|
test_expect_success '__gitcomp_nl - prefix' '
|
||||||
test_gitcomp_nl "--fixup=m" "$refs" "--fixup=" "m" <<-EOF
|
test_gitcomp_nl "--fixup=m" "$refs" "--fixup=" "m" <<-EOF
|
||||||
|
--fixup=main Z
|
||||||
--fixup=maint Z
|
--fixup=maint Z
|
||||||
--fixup=master Z
|
|
||||||
EOF
|
EOF
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success '__gitcomp_nl - suffix' '
|
test_expect_success '__gitcomp_nl - suffix' '
|
||||||
test_gitcomp_nl "branch.ma" "$refs" "branch." "ma" "." <<-\EOF
|
test_gitcomp_nl "branch.ma" "$refs" "branch." "ma" "." <<-\EOF
|
||||||
|
branch.main.Z
|
||||||
branch.maint.Z
|
branch.maint.Z
|
||||||
branch.master.Z
|
|
||||||
EOF
|
EOF
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success '__gitcomp_nl - no suffix' '
|
test_expect_success '__gitcomp_nl - no suffix' '
|
||||||
test_gitcomp_nl "ma" "$refs" "" "ma" "" <<-\EOF
|
test_gitcomp_nl "ma" "$refs" "" "ma" "" <<-\EOF
|
||||||
|
mainZ
|
||||||
maintZ
|
maintZ
|
||||||
masterZ
|
|
||||||
EOF
|
EOF
|
||||||
'
|
'
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user