mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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
This commit is contained in:
commit
56219baf1e
|
@ -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' '
|
||||
|
|
|
@ -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' '
|
||||
|
|
Loading…
Reference in a new issue