From: Johannes Schindelin Date: Fri, 23 Oct 2020 14:00:04 +0000 (+0000) Subject: t9902: prepare a test for the upcoming default branch name X-Git-Tag: v2.30.0-rc0~119^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8164360fc86;p=thirdparty%2Fgit.git t9902: prepare a test for the upcoming default branch name 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 7b7bc6e4bd..0badcf829b 100755 --- 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" '