diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-31 11:38:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-31 11:38:44 -0700 |
| commit | 56219baf1eae50134ee05eaa64e26e7f1207042c (patch) | |
| tree | ea86737747e013cbfe89b2272992fcb7cd4debfc /t/t4202-log.sh | |
| parent | Merge tag 'l10n-2.27.0-rnd2' of git://github.com/git-l10n/git-po (diff) | |
| parent | t: avoid alternation (not POSIX) in grep's BRE (diff) | |
| download | tgif-56219baf1eae50134ee05eaa64e26e7f1207042c.tar.xz | |
Merge branch 'cb/test-use-ere-for-alternation'
Portability fix for tests added recently.
* cb/test-use-ere-for-alternation:
t: avoid alternation (not POSIX) in grep's BRE
Diffstat (limited to 't/t4202-log.sh')
| -rwxr-xr-x | t/t4202-log.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index f1ea7d97f5..a0930599aa 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -1692,7 +1692,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' ' |