diff options
| author |  Carlo Marcelo Arenas Belón <carenas@gmail.com> | 2020-05-19 20:44:44 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-05-20 08:57:07 -0700 |
| commit | c703309024bccbcbb3017f6dbff707bb467225a4 (patch) | |
| tree | 3e940aa525e9f45291a23464a033be0b42f9cd23 | |
| parent | pull: pass --autostash to merge (diff) | |
| download | tgif-c703309024bccbcbb3017f6dbff707bb467225a4.tar.xz | |
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>
| -rwxr-xr-x | t/t5520-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 ' |