t5520: avoid alternation in grep's BRE (not POSIX)
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Carlo Marcelo Arenas Belón committed
May 19, 2020 at 20:44 UTC
c703309024bccbcbb3017f6dbff707bb467225a4
1 file changed
+1
-1
t/t5520-pull.sh
+1
-1
@@ -28,7 +28,7 @@ test_pull_autostash_fail () {
28
echo dirty >new_file &&
29
git add new_file &&
30
test_must_fail git pull "$@" . copy 2>err &&
31
- test_i18ngrep "\(uncommitted changes.\)\|\(overwritten by merge:\)" err
31
+ test_i18ngrep -E "uncommitted changes.|overwritten by merge:" err
32
}
33
34
test_expect_success setup '