diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:17:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:17:50 -0700 |
| commit | b43b8a20d33f6b19b088b505537133fc898048f6 (patch) | |
| tree | d53ea996e3dc6d9c12e85f2ddb93536da940c229 | |
| parent | b9a77eeda1d7f8a56fb7aed1063956c653d137d1 (diff) | |
| parent | f6918da789b07fabbc82e189d0bac50a79622828 (diff) | |
| download | git-b43b8a20d33f6b19b088b505537133fc898048f6.tar.gz | |
Merge branch 'bg/t5540-osx-grep'
* bg/t5540-osx-grep:
t5540-http-test: shorten grep pattern
| -rwxr-xr-x | t/t5540-http-push.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh index a266ca5636..64767d8705 100755 --- 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] " ' |