diff mbox series

[05/10] t6200: adjust suppression pattern to also match "main"

Message ID 7860d8d7df43075ad5424d8210d6f6e17c2042db.1603135903.git.gitgitgadget@gmail.com
State New
Headers show
Series Prepare for changing the default branch name main (last manual part) | expand

Commit Message

Johannes Schindelin Oct. 19, 2020, 7:31 p.m. UTC
From: Johannes Schindelin <johannes.schindelin@gmx.de>

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>
---
 t/t6200-fmt-merge-msg.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Junio C Hamano Oct. 21, 2020, 10:27 p.m. UTC | #1
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> -	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 &&

Cute.  IIRC, the point of this test was to ensure that a glob
pattern works, so we can do a bit better to avoid colliding with
another common name 'maint' by tightening the pattern to something
like "ma?*[rn]".
Johannes Schindelin Oct. 22, 2020, 1:01 p.m. UTC | #2
Hi Junio,

On Wed, 21 Oct 2020, Junio C Hamano wrote:

> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > -	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 &&
>
> Cute.  IIRC, the point of this test was to ensure that a glob
> pattern works, so we can do a bit better to avoid colliding with
> another common name 'maint' by tightening the pattern to something
> like "ma?*[rn]".

Good idea. I changed it locally.

Ciao,
Dscho
diff mbox series

Patch

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