summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-05-31 18:38:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-05-31 18:38:44 (GMT)
commit56219baf1eae50134ee05eaa64e26e7f1207042c (patch)
treeea86737747e013cbfe89b2272992fcb7cd4debfc
parent68f30e280d6ca282e189d1c0558bcd488c173b3b (diff)
parent46022ca34f28b0e9571a40f219b2d357b1ae497d (diff)
downloadgit-56219baf1eae50134ee05eaa64e26e7f1207042c.zip
git-56219baf1eae50134ee05eaa64e26e7f1207042c.tar.gz
git-56219baf1eae50134ee05eaa64e26e7f1207042c.tar.bz2
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
-rwxr-xr-xt/t4202-log.sh2
-rwxr-xr-xt/t6200-fmt-merge-msg.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index f1ea7d9..a093059 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' '
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' '