t9902: prepare a test for the upcoming default branch name

dscho · gitster · commit 8164360fc863 · 2020-10-23T08:57:42.000-07:00
We need to adjust a test that uses a prefix of the default branch name,
to accommodate for `main` being used soon.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
@@ -1055,13 +1055,13 @@ test_expect_success 'teardown after filtering matching refs' '
 	git -C otherrepo branch -D matching/branch-in-other
 '
 
-test_expect_success '__git_refs - for-each-ref format specifiers in prefix' '
+test_expect_success PREPARE_FOR_MAIN_BRANCH '__git_refs - for-each-ref format specifiers in prefix' '
 	cat >expected <<-EOF &&
 	evil-%%-%42-%(refname)..master
 	EOF
 	(
-		cur="evil-%%-%42-%(refname)..mas" &&
-		__git_refs "" "" "evil-%%-%42-%(refname).." mas >"$actual"
+		cur="evil-%%-%42-%(refname)..mai" &&
+		__git_refs "" "" "evil-%%-%42-%(refname).." mai >"$actual"
 	) &&
 	test_cmp expected "$actual"
 '

Original file line number	Diff line number	Diff line change
`@@ -1055,13 +1055,13 @@ test_expect_success 'teardown after filtering matching refs' '`
`1055`	`1055`	`git -C otherrepo branch -D matching/branch-in-other`
`1056`	`1056`	`'`
`1057`	`1057`
`1058`		`-test_expect_success '__git_refs - for-each-ref format specifiers in prefix' '`
	`1058`	`+test_expect_success PREPARE_FOR_MAIN_BRANCH '__git_refs - for-each-ref format specifiers in prefix' '`
`1059`	`1059`	`cat >expected <<-EOF &&`
`1060`	`1060`	`evil-%%-%42-%(refname)..master`
`1061`	`1061`	`EOF`
`1062`	`1062`	`(`
`1063`		`- cur="evil-%%-%42-%(refname)..mas" &&`
`1064`		`- __git_refs "" "" "evil-%%-%42-%(refname).." mas >"$actual"`
	`1063`	`+ cur="evil-%%-%42-%(refname)..mai" &&`
	`1064`	`+ __git_refs "" "" "evil-%%-%42-%(refname).." mai >"$actual"`
`1065`	`1065`	`) &&`
`1066`	`1066`	`test_cmp expected "$actual"`
`1067`	`1067`	`'`