mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
704fed9ea2
commit
392ab3d9ff
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue