Re: [ANNOUNCE] Git 1.7.9.3

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Thomas Rast <trast@xxxxxxxxxxx> writes:

> This can be fixed with the change below, which then gets us into the
> next one
>
>   grep: Regular expression too big
>
> Sheesh, Apple, are you kidding me?!  So we also need to change the grep
> expression.
>
> ----- 8< -----
> Subject: [PATCH] t5704: fix nonportable sed/grep usages
>
> OS X's sed and grep would complain with (respectively)
>
>   sed: 1: "/^-/{p;q}": extra characters at the end of q command
>   grep: Regular expression too big
>
> For sed, use an explicit ; to terminate the q command.
>
> For grep, spell the "40 hex digits" explicitly in the regex, instead
> of being lazy with the shell pattern $_x40.
> ---

Actually the shell pattern $_x40 was invented so that it can be used
in both shell, grep and sed; there is nothing *lazy* about it.

I share the "are you kidding me?!" with you.  I cannot fathom which
part of that regular expression is too big for them to swallow.

In any case, thanks for a quick fix; can I consider it as signed-off?

>  t/t5704-bundle.sh |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh
> index a51c8b0..9e43731 100755
> --- a/t/t5704-bundle.sh
> +++ b/t/t5704-bundle.sh
> @@ -54,8 +54,8 @@ test_expect_success 'ridiculously long subject in boundary' '
>  	git bundle list-heads long-subject-bundle.bdl >heads &&
>  	test -s heads &&
>  	git fetch long-subject-bundle.bdl &&
> -	sed -n "/^-/{p;q}" long-subject-bundle.bdl >boundary &&
> -	grep "^-$_x40 " boundary
> +	sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary &&
> +	grep "^-[0-9a-f]\\{40\\} " boundary
>  '
>  
>  test_done
> -- 
> 1.7.6.557.gcee4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]