Merge branch 'km/avoid-bs-in-shell-glob'
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Apr 2014 20:38:52 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Apr 2014 20:38:52 +0000 (13:38 -0700)
Portability fix.

* km/avoid-bs-in-shell-glob:
test: fix t5560 on FreeBSD

t/t5560-http-backend-noserver.sh
index 9be9ae3436c929921bc0a2cd2a458e4e4500c154..5abd11a5638299f2d3fe41d38f9a3d10050a4e4b 100755 (executable)
@@ -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
 }