Skip to content

Commit 392ab3d

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 704fed9 commit 392ab3d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t6200-fmt-merge-msg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ test_expect_success 'merge.suppressDest configuration' '
556556
head -n1 full.2 >actual &&
557557
grep -e "Merge branch .side. into master$" actual &&
558558
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 &&
560560
head -n1 full.3 >actual &&
561561
grep -e "Merge branch .side." actual &&
562562
! grep -e " into master$" actual

0 commit comments

Comments
 (0)