From: Johannes Schindelin Date: Fri, 23 Oct 2020 14:00:01 +0000 (+0000) Subject: t6200: adjust suppression pattern to also match "main" X-Git-Tag: v2.30.0-rc0~119^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=392ab3d9ff78658b2e456eede3ebeaec9d89197f;p=thirdparty%2Fgit.git t6200: adjust suppression pattern to also match "main" In preparation to running t6200 with the default branch name set to "main", let's adjust the only non-trivial aspect thereof. The rest will be done via a trivial `sed` invocation. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index 7d549748ef..f3e66eaf9b 100755 --- a/t/t6200-fmt-merge-msg.sh +++ b/t/t6200-fmt-merge-msg.sh @@ -556,7 +556,7 @@ test_expect_success 'merge.suppressDest configuration' ' head -n1 full.2 >actual && grep -e "Merge branch .side. into master$" actual && - git -c merge.suppressDest="ma??er" fmt-merge-msg <.git/FETCH_HEAD >full.3 && + git -c merge.suppressDest="ma?*[rn]" fmt-merge-msg <.git/FETCH_HEAD >full.3 && head -n1 full.3 >actual && grep -e "Merge branch .side." actual && ! grep -e " into master$" actual