[PATCH] t7508: avoid non POSIX BRE

Carlo Marcelo Arenas Belón· Aug 1, 2021, 21:53 UTC · lore

24c30e0b6 (wt-status: tolerate dangling marks, 2020-09-01) adds a test that uses a BRE which breaks at least with OpenBSD's grep.

switch to an ERE as it is done for similar checks and while at it, remove the now obsolete test_i18ngrep call.

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
 t/t7508-status.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to t/t7508-status.sh +1 −1

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 2b72451ba3..05c6c02435 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -882,7 +882,7 @@ test_expect_success 'status shows detached HEAD properly after checking out non-
 	git clone upstream downstream &&
 	git -C downstream checkout @{u} &&
 	git -C downstream status >actual &&
-	test_i18ngrep "HEAD detached at [0-9a-f]\\+" actual
+	grep -E "HEAD detached at [0-9a-f]+" actual
 '
 
 test_expect_success 'setup status submodule summary' '

-- 
2.32.0.826.g286871f41a

Junio C Hamano· Aug 2, 2021, 02:37 UTC · re: Carlo Marcelo Arenas Belón · lore

Re: [PATCH] t7508: avoid non POSIX BRE

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

Show 5 quoted lines

> 24c30e0b6 (wt-status: tolerate dangling marks, 2020-09-01) adds a test
> that uses a BRE which breaks at least with OpenBSD's grep.
>
> switch to an ERE as it is done for similar checks and while at it, remove
> the now obsolete test_i18ngrep call.

Thanks, obviously correct.

I wonder if we can more automate detection of such a bug---it is unfortunate that it has become very hard to avoid GNUisms as everybody, even Windows folks, is more likely to be with GNU tools than BSD tools X-<.

Show 19 quoted lines

>
> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
> ---
>  t/t7508-status.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t7508-status.sh b/t/t7508-status.sh
> index 2b72451ba3..05c6c02435 100755
> --- a/t/t7508-status.sh
> +++ b/t/t7508-status.sh
> @@ -882,7 +882,7 @@ test_expect_success 'status shows detached HEAD properly after checking out non-
>  	git clone upstream downstream &&
>  	git -C downstream checkout @{u} &&
>  	git -C downstream status >actual &&
> -	test_i18ngrep "HEAD detached at [0-9a-f]\\+" actual
> +	grep -E "HEAD detached at [0-9a-f]+" actual
>  '
>  
>  test_expect_success 'setup status submodule summary' '

patcht7508: avoid non POSIX BRE