Re: [PATCH] test-bzr: Do not use unportable sed "\+"
- From
Torsten Bögershausen <tboegi@web.de>
- Date
- May 11, 2013, 20:00 UTC
- Message-ID
- <518EA351.8000603@web.de>
- In-Reply-To
- <7vobchwbax.fsf@alter.siamese.dyndns.org>
On 11.05.13 21:45, Junio C Hamano wrote:
Show 28 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Thanks. Is there another one in t/t5551-http-fetch.sh that checks
>> the tags?
>
> I think your sed will see the same breakage for the one in 5551 (my
> sed is unfortunately GNU and ".\+" does not break it). Could you
> test this patch with:
>
> GIT_TEST_LONG=YesPlease GIT_TEST_HTTPD=YesPlease \
> ./t5551-http-fetch.sh
>
> Thanks.
>
> t/t5551-http-fetch.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh
> index b23efbb..4a3184e 100755
> --- a/t/t5551-http-fetch.sh
> +++ b/t/t5551-http-fetch.sh
> @@ -209,7 +209,7 @@ test_expect_success EXPENSIVE 'create 50,000 tags in the repo' '
>
> # now assign tags to all the dangling commits we created above
> tag=$("$PERL_PATH" -e "print \"bla\" x 30") &&
> - sed -e "s/^:\(.\+\) \(.\+\)$/\2 refs\/tags\/$tag-\1/" <marks >>packed-refs
> + sed -e "s|^:\([^ ]*\) \(.*\)$|\2 refs/tags/$tag-\1|" <marks >>packed-refs
> )I did, the interesting thing is that the test passes with and without your patch. (After enabling GIT_TEST_LONG and GIT_TEST_HTTPD in both cases)
Side note: I added this line in in t/check-non-portable-shell.pl /sed[^"]+"[^"]+\\([+])/ and err "sed \\$1 is not portable)";