git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Cc: git@vger.kernel.org, liu.denton@gmail.com, chwarr@microsoft.com,
	garima.singh@microsoft.com
Subject: Re: [PATCH 3/3] t5520: avoid alternation in grep's BRE (not POSIX)
Date: Wed, 20 May 2020 07:58:19 -0700	[thread overview]
Message-ID: <xmqqv9kqwt4k.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200520034444.47932-4-carenas@gmail.com> ("Carlo Marcelo Arenas =?utf-8?Q?Bel=C3=B3n=22's?= message of "Tue, 19 May 2020 20:44:44 -0700")

Carlo Marcelo Arenas Belón  <carenas@gmail.com> writes:

> Instead of using a BRE, that broke tests 30-32, 37-39, 42 at least with
> OpenBSD 6.7; use a simpler ERE.

Thanks.  We already do use "test_i18ngrep -E" in another test, so
this should be safe.

> 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 '

      reply	other threads:[~2020-05-20 14:58 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 ` [PATCH 3/3] t5520: avoid alternation in grep's BRE (not POSIX) Carlo Marcelo Arenas Belón
2020-05-20 14:58   ` Junio C Hamano [this message]

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=xmqqv9kqwt4k.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=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).