Re: [PATCH] t5540-http-push.sh: avoid non-portable grep -P

[Junio C Hamano <gitster@pobox.com>]

Brandon Casey <casey@nrlssc.navy.mil> writes:

> Johannes Schindelin wrote:
>> Hi,
>> 
>> On Thu, 26 Feb 2009, Brandon Casey wrote:
>> 
>>>    sed -e 'script' input-file
>>>
>>> rather than
>>>
>>>    sed -e 'script' < input-file
>> 
>> What should make the former more preferable to the latter?
>
> It's less complex, but as you describe in the next paragraph, if the
> file name is not desired in the result then the latter is preferable.
> I initially viewed the latter form as a useless use of cat, equivalent
> to:
>
>    cat input-file | sed -e 'script'
>
>> Especially given that the latter way is preferable with other commands (at 
>> least as far as our test suite is concerned), such as grep, because you do 
>> not get the file name as part of the result?
>> 
>> And especially given that sed means _stream_ editor, not file editor?
>
> especially? Your first argument is valid, but this last sentence means nothing.
>

Ok, ok, I heard all of you.  I think "sed -e 'script' file" is better
because it is one letter shorter than with "<" rediretion, nothing else.

I merely was shooting for rejecting an obvious crap, not aiming for
perfection.

Here is the final one.  Let's stop wasting time and go on with our lives
;-)

Thanks.

-- >8 --
From: Jay Soffian <jaysoffian@gmail.com>
Date: Thu, 26 Feb 2009 18:44:40 -0500
Subject: [PATCH] t5540-http-push.sh: avoid non-portable grep -P

OS X's GNU grep does not support -P/--perl-regexp.

We use a basic RE instead, and simplify the pattern slightly by
replacing '+' with '*' so it can be more easily expressed using a basic
RE.  The important part of pattern, checking for a SHA-1 has suffix in
the successful PUT/MOVE operations, remains the same.  Also, a-z instead
of a-f was an obvious mistake in the original RE. Here are samples of
what we want to match:

127.0.0.1 - - [26/Feb/2009:22:38:13 +0000] "PUT /test_repo.git/objects/3e/a4fbb9e18a401a6463c595d08118fcb9fb7426_fab55116904c665a95438bcc78521444a7db6096 HTTP/1.1" 201 277
127.0.0.1 - - [26/Feb/2009:22:38:13 +0000] "MOVE /test_repo.git/objects/3e/a4fbb9e18a401a6463c595d08118fcb9fb7426_fab55116904c665a95438bcc78521444a7db6096 HTTP/1.1" 201 277

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t5540-http-push.sh |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
index 11b3432..10e5fd0 100755
--- a/t/t5540-http-push.sh
+++ b/t/t5540-http-push.sh
@@ -94,10 +94,15 @@ test_expect_success 'MKCOL sends directory names with trailing slashes' '
 
 '
 
-test_expect_success 'PUT and MOVE sends object to URLs with SHA-1 hash suffix' '
+x1="[0-9a-f]"
+x2="$x1$x1"
+x5="$x1$x1$x1$x1$x1"
+x38="$x5$x5$x5$x5$x5$x5$x5$x1$x1$x1"
+x40="$x38$x2"
 
-	grep -P "\"(?:PUT|MOVE) .+objects/[\da-z]{2}/[\da-z]{38}_[\da-z\-]{40} HTTP/[0-9.]+\" 20\d" \
-		< "$HTTPD_ROOT_PATH"/access.log
+test_expect_success 'PUT and MOVE sends object to URLs with SHA-1 hash suffix' '
+	sed -e "s/PUT /OP /" -e "s/MOVE /OP /" "$HTTPD_ROOT_PATH"/access.log |
+	grep -e "\"OP .*/objects/$x2/${x38}_$x40 HTTP/[.0-9]*\" 20[0-9] "
 
 '
 
-- 
1.6.2.rc2.91.gf9a36