]> git.ipfire.org Git - thirdparty/git.git/commit
t5520: avoid alternation in grep's BRE (not POSIX)
authorCarlo Marcelo Arenas Belón <carenas@gmail.com>
Wed, 20 May 2020 03:44:44 +0000 (20:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2020 15:57:07 +0000 (08:57 -0700)
commitc703309024bccbcbb3017f6dbff707bb467225a4
tree3e940aa525e9f45291a23464a033be0b42f9cd23
parentd9f15d37f1a545305988f6b2bb40de1fbf0049cf
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>
t/t5520-pull.sh