Re: [PATCH] Switch grep from non-portable BRE to portable ERE
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 17, 2024, 18:02 UTC
- Message-ID
- <xmqq7cfsiaff.fsf@gitster.g>
- In-Reply-To
- <ZkePejx-eRNrspZ2@telcontar>
Marcel Telka <marcel@telka.sk> writes:
> Subject: Re: [PATCH] Switch grep from non-portable BRE to portable ERE > > This makes the grep usage fully POSIX compliant.
May want to mention that using backslash to invoke ERE feature in BRE is a GNU extension?
Thanks for this and other portability patches. You are porting to a new platform, I presume, where either nobody else ported to before or those who ported did not bother reporting test breakages to us?
Show 32 quoted lines
> Signed-off-by: Marcel Telka <marcel@telka.sk>
> ---
> mergetools/vimdiff | 2 +-
> t/t1404-update-ref-errors.sh | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mergetools/vimdiff b/mergetools/vimdiff
> index 734d15a03b..f8ad6b35d4 100644
> --- a/mergetools/vimdiff
> +++ b/mergetools/vimdiff
> @@ -325,7 +325,7 @@ gen_cmd () {
> fi
>
> # If this is a single window diff with all the buffers
> - if ! echo "$tab" | grep ",\|/" >/dev/null
> + if ! echo "$tab" | grep -E ",|/" >/dev/null
> then
> CMD="$CMD | silent execute 'bufdo diffthis'"
> fi
> diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
> index 98e9158bd2..67ebd81a4c 100755
> --- a/t/t1404-update-ref-errors.sh
> +++ b/t/t1404-update-ref-errors.sh
> @@ -100,7 +100,7 @@ df_test() {
> printf "%s\n" "delete $delname" "create $addname $D"
> fi >commands &&
> test_must_fail git update-ref --stdin <commands 2>output.err &&
> - grep "fatal:\( cannot lock ref $SQ$addname$SQ:\)\? $SQ$delref$SQ exists; cannot create $SQ$addref$SQ" output.err &&
> + grep -E "fatal:( cannot lock ref $SQ$addname$SQ:)? $SQ$delref$SQ exists; cannot create $SQ$addref$SQ" output.err &&
> printf "%s\n" "$C $delref" >expected-refs &&
> git for-each-ref --format="%(objectname) %(refname)" $prefix/r >actual-refs &&
> test_cmp expected-refs actual-refs