File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -1692,7 +1692,7 @@ test_expect_success GPG 'log --graph --show-signature for merged tag with missin
1692
1692
GNUPGHOME=. git log --graph --show-signature -n1 plain-nokey >actual &&
1693
1693
grep "^|\\\ merged tag" actual &&
1694
1694
grep "^| | gpg: Signature made" actual &&
1695
- grep "^| | gpg: Can' " '" ' t check signature: \ (public key not found\ |No public key\ )" actual
1695
+ grep -E "^| | gpg: Can' " '" ' t check signature: (public key not found|No public key)" actual
1696
1696
'
1697
1697
1698
1698
test_expect_success GPG ' log --graph --show-signature for merged tag with bad signature' '
Original file line number Diff line number Diff line change @@ -103,7 +103,7 @@ test_expect_success GPG 'message for merging local tag signed by unknown key' '
103
103
GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
104
104
grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
105
105
grep "^# gpg: Signature made" actual &&
106
- grep "^# gpg: Can${apos}t check signature: \ (public key not found\ |No public key\ )" actual
106
+ grep -E "^# gpg: Can${apos}t check signature: (public key not found|No public key)" actual
107
107
'
108
108
109
109
test_expect_success ' message for merging external branch' '
You can’t perform that action at this time.
0 commit comments