diff options
| author | Carlo Marcelo Arenas Belón <carenas@gmail.com> | 2020-05-29 08:20:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-29 22:04:03 (GMT) |
| commit | 46022ca34f28b0e9571a40f219b2d357b1ae497d (patch) | |
| tree | 7d0062cbc097d157df852284976df3998217b01a | |
| parent | fa82be982dfc5b463a125991a2d381f1cd0ad9eb (diff) | |
| download | git-46022ca34f28b0e9571a40f219b2d357b1ae497d.zip git-46022ca34f28b0e9571a40f219b2d357b1ae497d.tar.gz git-46022ca34f28b0e9571a40f219b2d357b1ae497d.tar.bz2 | |
t: avoid alternation (not POSIX) in grep's BRE
f1e3df3169 (t: increase test coverage of signature verification output,
2020-03-04) adds GPG dependent tests to t4202 and t6200 that were found
problematic with at least OpenBSD 6.7.
Using an escaped '|' for alternations works only in some implementations
of grep (e.g. GNU and busybox).
It is not part of POSIX[1] and not supported by some BSD, macOS, and
possibly other POSIX compatible implementations.
Use `grep -E`, and write it using extended regular expression.
[1] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_03
Helped-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t4202-log.sh | 2 | ||||
| -rwxr-xr-x | t/t6200-fmt-merge-msg.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 5eeb739..691699a 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -1643,7 +1643,7 @@ test_expect_success GPG 'log --graph --show-signature for merged tag with missin GNUPGHOME=. git log --graph --show-signature -n1 plain-nokey >actual && grep "^|\\\ merged tag" actual && grep "^| | gpg: Signature made" actual && - grep "^| | gpg: Can'"'"'t check signature: \(public key not found\|No public key\)" actual + grep -E "^| | gpg: Can'"'"'t check signature: (public key not found|No public key)" actual ' test_expect_success GPG 'log --graph --show-signature for merged tag with bad signature' ' diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index b15582a..e4c2a6e 100755 --- a/t/t6200-fmt-merge-msg.sh +++ b/t/t6200-fmt-merge-msg.sh @@ -103,7 +103,7 @@ test_expect_success GPG 'message for merging local tag signed by unknown key' ' GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 && grep "^Merge tag ${apos}signed-good-tag${apos}" actual && grep "^# gpg: Signature made" actual && - grep "^# gpg: Can${apos}t check signature: \(public key not found\|No public key\)" actual + grep -E "^# gpg: Can${apos}t check signature: (public key not found|No public key)" actual ' test_expect_success 'message for merging external branch' ' |