From: Johannes Schindelin <johannes.schindelin@xxxxxx> 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 <johannes.schindelin@xxxxxx> --- t/t6200-fmt-merge-msg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index 7d549748ef..e61f8fb3d0 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*" fmt-merge-msg <.git/FETCH_HEAD >full.3 && head -n1 full.3 >actual && grep -e "Merge branch .side." actual && ! grep -e " into master$" actual -- gitgitgadget
