Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'bg/t5540-osx-grep'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 2 Sep 2011 20:17:50 +0000
(13:17 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 2 Sep 2011 20:17:50 +0000
(13:17 -0700)
* bg/t5540-osx-grep:
t5540-http-test: shorten grep pattern
t/t5540-http-push.sh
patch
|
blob
|
history
raw
(from parent 1:
b9a77ee
)
diff --git
a/t/t5540-http-push.sh
b/t/t5540-http-push.sh
index a266ca56361347fe751495e1531b5a26e4733493..64767d87055c9ad65a225432b5193497c9fad405 100755
(executable)
--- a/
t/t5540-http-push.sh
+++ b/
t/t5540-http-push.sh
@@
-132,8
+132,12
@@
x38="$x5$x5$x5$x5$x5$x5$x5$x1$x1$x1"
x40="$x38$x2"
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] "
+ sed \
+ -e "s/PUT /OP /" \
+ -e "s/MOVE /OP /" \
+ -e "s|/objects/$x2/${x38}_$x40|WANTED_PATH_REQUEST|" \
+ "$HTTPD_ROOT_PATH"/access.log |
+ grep -e "\"OP .*WANTED_PATH_REQUEST HTTP/[.0-9]*\" 20[0-9] "
'