From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: liu.denton@gmail.com, chwarr@microsoft.com,
garima.singh@microsoft.com,
"Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Subject: [PATCH 3/3] t5520: avoid alternation in grep's BRE (not POSIX)
Date: Tue, 19 May 2020 20:44:44 -0700 [thread overview]
Message-ID: <20200520034444.47932-4-carenas@gmail.com> (raw)
In-Reply-To: <20200520034444.47932-1-carenas@gmail.com>
Instead of using a BRE, that broke tests 30-32, 37-39, 42 at least with
OpenBSD 6.7; use a simpler ERE.
Fixes: d9f15d37f1 (pull: pass --autostash to merge, 2020-04-07)
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
t/t5520-pull.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 37535d63a9..9fae07cdfa 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -28,7 +28,7 @@ test_pull_autostash_fail () {
echo dirty >new_file &&
git add new_file &&
test_must_fail git pull "$@" . copy 2>err &&
- test_i18ngrep "\(uncommitted changes.\)\|\(overwritten by merge:\)" err
+ test_i18ngrep -E "uncommitted changes.|overwritten by merge:" err
}
test_expect_success setup '
--
2.27.0.rc0.187.gede8c892b8
next prev parent reply other threads:[~2020-05-20 3:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 3:44 [PATCH 0/3] openbsd: fixes for 2.27.0-RC0 Carlo Marcelo Arenas Belón
2020-05-20 3:44 ` [PATCH 1/3] t4216: avoid unnecessary subshell in test_bloom_filters_not_used Carlo Marcelo Arenas Belón
2020-05-20 15:04 ` Junio C Hamano
2020-05-20 3:44 ` [PATCH 2/3] bisect: remove CR characters from revision in replay Carlo Marcelo Arenas Belón
2020-05-20 14:56 ` Junio C Hamano
2020-05-20 17:08 ` Carlo Marcelo Arenas Belón
2020-05-20 17:14 ` Junio C Hamano
2020-05-20 20:59 ` [EXTERNAL] " Christopher Warrington (CHRISTOPHER)
2020-05-20 21:14 ` Junio C Hamano
2020-05-20 3:44 ` Carlo Marcelo Arenas Belón [this message]
2020-05-20 14:58 ` [PATCH 3/3] t5520: avoid alternation in grep's BRE (not POSIX) Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200520034444.47932-4-carenas@gmail.com \
--to=carenas@gmail.com \
--cc=chwarr@microsoft.com \
--cc=garima.singh@microsoft.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).