global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-11 02:32:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

t5520: avoid alternation in grep's BRE (not POSIX)

Browse Source 
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>
This commit is contained in:
Carlo Marcelo Arenas Belón
2020-05-19 20:44:44 -07:00
committed by Junio C Hamano
parent d9f15d37f1
commit c703309024
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t5520-pull.sh
View File

@@ -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 '