Merge branch 'km/avoid-bs-in-shell-glob' into maint

gitster · gitster · commit 16fefdc3ebbe · 2014-05-08T10:00:36.000-07:00
Some tests used shell constructs that did not work well on FreeBSD

* km/avoid-bs-in-shell-glob:
  test: fix t5560 on FreeBSD
diff --git 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
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U`
`9`	`9`
`10`	`10`	`run_backend() {`
`11`	`11`	`echo "$2" \|`
`12`		`- QUERY_STRING="${1#*\?}" \`
`13`		`- PATH_TRANSLATED="$HTTPD_DOCUMENT_ROOT_PATH/${1%%\?*}" \`
	`12`	`+ QUERY_STRING="${1#*[?]}" \`
	`13`	`+ PATH_TRANSLATED="$HTTPD_DOCUMENT_ROOT_PATH/${1%%[?]*}" \`
`14`	`14`	`git http-backend >act.out 2>act.err`
`15`	`15`	`}`
`16`	`16`