Re: [PATCH] t: avoid alternation (not POSIX) in grep's BRE

From: Junio C Hamano <gitster@pobox.com>
Date: May 28, 2020, 15:20 UTC
Message-ID: <xmqqo8q83x3v.fsf@gitster.c.googlers.com>
In-Reply-To: <20200528083745.15273-1-carenas@gmail.com>

Carlo Marcelo Arenas Belón  <carenas@gmail.com> writes:

Show 6 quoted lines

> Using and escaped '|' for alternations is allowed in some implementations
> of grep (GNU and busybox, al least), but it is no suppored by POSIX[1]
> and therefore will fail in at least macOS and the BSD.
>
> Change syntax to ERE and use Extended regular expression with grep
> explicitly.

Thanks.

> [1] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_03
>
> Fixes: f1e3df3169 (t: increase test coverage of signature verification
>        output, 2020-03-04)

I do appreciate the information recorded in the log message, but not like this. Does everybody's tool understand the "folding" the above two physical lines require to be able to handle it correctly?

Show 32 quoted lines

> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
> ---
>  t/t4202-log.sh           | 2 +-
>  t/t6200-fmt-merge-msg.sh | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t4202-log.sh b/t/t4202-log.sh
> index f1ea7d97f5..a0930599aa 100755
> --- a/t/t4202-log.sh
> +++ b/t/t4202-log.sh
> @@ -1692,7 +1692,7 @@ test_expect_success GPG 'log --graph --show-signature for merged tag with missin
>  	GNUPGHOME=. git log --graph --show-signature -n1 plain-nokey >actual &&
>  	grep "^|\\\  merged tag" actual &&
>  	grep "^| | gpg: Signature made" actual &&
> -	grep "^| | gpg: Can'"'"'t check signature: \(public key not found\|No public key\)" actual
> +	grep -E "^| | gpg: Can'"'"'t check signature: (public key not found|No public key)" actual
>  '
>  
>  test_expect_success GPG 'log --graph --show-signature for merged tag with bad signature' '
> diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
> index b15582a7a2..e4c2a6eca4 100755
> --- a/t/t6200-fmt-merge-msg.sh
> +++ b/t/t6200-fmt-merge-msg.sh
> @@ -103,7 +103,7 @@ test_expect_success GPG 'message for merging local tag signed by unknown key' '
>  	GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
>  	grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
>  	grep "^# gpg: Signature made" actual &&
> -	grep "^# gpg: Can${apos}t check signature: \(public key not found\|No public key\)" actual
> +	grep -E "^# gpg: Can${apos}t check signature: (public key not found|No public key)" actual
>  '
>  
>  test_expect_success 'message for merging external branch' '