diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-08 10:00:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-08 10:00:36 -0700 |
| commit | 16fefdc3ebbe509f3d4293bea3cbf2722c6e80aa (patch) | |
| tree | f6dec1b939b64a8ca27c3c774441f890efdac331 | |
| parent | 73edc54e9083695cebaeebdac6d9a459ff7b04fd (diff) | |
| parent | ff7a1c677a88eda9a24489676052f0631a6b7fc8 (diff) | |
| download | git-16fefdc3ebbe509f3d4293bea3cbf2722c6e80aa.tar.gz | |
Merge branch 'km/avoid-bs-in-shell-glob' into maint
Some tests used shell constructs that did not work well on FreeBSD
* km/avoid-bs-in-shell-glob:
test: fix t5560 on FreeBSD
| -rwxr-xr-x | t/t5560-http-backend-noserver.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh index 9be9ae3436..5abd11a563 100755 --- a/t/t5560-http-backend-noserver.sh +++ b/t/t5560-http-backend-noserver.sh @@ -9,8 +9,8 @@ test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U run_backend() { echo "$2" | - QUERY_STRING="${1#*\?}" \ - PATH_TRANSLATED="$HTTPD_DOCUMENT_ROOT_PATH/${1%%\?*}" \ + QUERY_STRING="${1#*[?]}" \ + PATH_TRANSLATED="$HTTPD_DOCUMENT_ROOT_PATH/${1%%[?]*}" \ git http-backend >act.out 2>act.err } |