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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Oct 23, 2020 at 14:00 UTC
392ab3d9ff78658b2e456eede3ebeaec9d89197f
1 file changed
+1
-1
t/t6200-fmt-merge-msg.sh
+1
-1
@@ -556,7 +556,7 @@ test_expect_success 'merge.suppressDest configuration' '
556
head -n1 full.2 >actual &&
557
grep -e "Merge branch .side. into master$" actual &&
558
559
- git -c merge.suppressDest="ma??er" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
559
+ git -c merge.suppressDest="ma?*[rn]" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
560
head -n1 full.3 >actual &&
561
grep -e "Merge branch .side." actual &&
562
! grep -e " into master$" actual