Skip to contentSkip to conversation

t7508: avoid non POSIX BRE

PATCH In review Carlo Marcelo Arenas Belón 2 participants 2 messages Aug 1, 2021 – Aug 2, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 t7508: avoid non POSIX BRE

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.

---
 t/t7508-status.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
t/t7508-status.sh +1 -1
index 2b72451ba3..05c6c02435 100755
@@ -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' '
Signature · 1 line
2.32.0.826.g286871f41a
#1 lore raw
Quoted 5 lines · Carlo Marcelo Arenas Belón

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

Quoted 19 lines
---
 t/t7508-status.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
t/t7508-status.sh +1 -1
index 2b72451ba3..05c6c02435 100755
@@ -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' '