diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-10-23 17:00:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-23 18:57:41 +0300 |
| commit | 392ab3d9ff78658b2e456eede3ebeaec9d89197f (patch) | |
| tree | d94a971afd25a17390a0e0d706a33131f12c7fb7 /t/t6200-fmt-merge-msg.sh | |
| parent | 704fed9ea22230929639c9e5fca122045f84311d (diff) | |
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>
Diffstat (limited to 't/t6200-fmt-merge-msg.sh')
| -rwxr-xr-x | t/t6200-fmt-merge-msg.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |