[PATCH 3/3] t5520: avoid alternation in grep's BRE (not POSIX)
To
git@vger.kernel.org
Cc
liu.denton@gmail.com
chwarr@microsoft.com
garima.singh@microsoft.com
Carlo Marcelo Arenas Belón
From
Carlo Marcelo Arenas Belón
See Also
Prev
Date
2020-05-20 03:44:44 UTC
Instead of using a BRE, that broke tests 30-32, 37-39, 42 at least with
OpenBSD 6.7; use a simpler ERE.

Fixes: d9f15d37f1 (pull: pass --autostash to merge, 2020-04-07)
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
 t/t5520-pull.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 37535d63a9..9fae07cdfa 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -28,7 +28,7 @@ test_pull_autostash_fail () {
 	echo dirty >new_file &&
 	git add new_file &&
 	test_must_fail git pull "$@" . copy 2>err &&
-	test_i18ngrep "\(uncommitted changes.\)\|\(overwritten by merge:\)" err
+	test_i18ngrep -E "uncommitted changes.|overwritten by merge:" err
 }
 
 test_expect_success setup '
-- 
2.27.0.rc0.187.gede8c892b8