Skip to content

Commit 56219ba

Browse files
committed
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
2 parents 68f30e2 + 46022ca commit 56219ba

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

t/t4202-log.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1692,7 +1692,7 @@ test_expect_success GPG 'log --graph --show-signature for merged tag with missin
16921692
GNUPGHOME=. git log --graph --show-signature -n1 plain-nokey >actual &&
16931693
grep "^|\\\ merged tag" actual &&
16941694
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
16961696
'
16971697

16981698
test_expect_success GPG 'log --graph --show-signature for merged tag with bad signature' '

t/t6200-fmt-merge-msg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ test_expect_success GPG 'message for merging local tag signed by unknown key' '
103103
GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
104104
grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
105105
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
107107
'
108108

109109
test_expect_success 'message for merging external branch' '

0 commit comments

Comments
 (0)