Skip to content

Commit dd88a1a

Browse files
committed
Merge branch 'js/t5563-portability-fix'
Test portability fix. * js/t5563-portability-fix: t5563: prevent "ambiguous redirect"
2 parents 5ae4bd1 + 92c7b3d commit dd88a1a

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

t/t5563-simple-http-auth.sh

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -252,15 +252,14 @@ test_expect_success 'access using basic auth with wwwauth header empty continuat
252252
253253
# Note that leading and trailing whitespace is important to correctly
254254
# simulate a continuation/folded header.
255-
printf "">$CHALLENGE &&
256-
printf "WWW-Authenticate: FooBar param1=\"value1\"\r\n" >$CHALLENGE &&
257-
printf " \r\n" >>$CHALLENGE &&
258-
printf " param2=\"value2\"\r\n" >>$CHALLENGE &&
259-
printf "WWW-Authenticate: Bearer authorize_uri=\"id.example.com\"\r\n" >>$CHALLENGE &&
260-
printf " p=1\r\n" >>$CHALLENGE &&
261-
printf " \r\n" >>$CHALLENGE &&
262-
printf " q=0\r\n" >>$CHALLENGE &&
263-
printf "WWW-Authenticate: Basic realm=\"example.com\"\r\n" >>$CHALLENGE &&
255+
printf "WWW-Authenticate: FooBar param1=\"value1\"\r\n" >"$CHALLENGE" &&
256+
printf " \r\n" >>"$CHALLENGE" &&
257+
printf " param2=\"value2\"\r\n" >>"$CHALLENGE" &&
258+
printf "WWW-Authenticate: Bearer authorize_uri=\"id.example.com\"\r\n" >>"$CHALLENGE" &&
259+
printf " p=1\r\n" >>"$CHALLENGE" &&
260+
printf " \r\n" >>"$CHALLENGE" &&
261+
printf " q=0\r\n" >>"$CHALLENGE" &&
262+
printf "WWW-Authenticate: Basic realm=\"example.com\"\r\n" >>"$CHALLENGE" &&
264263
265264
test_config_global credential.helper test-helper &&
266265
git ls-remote "$HTTPD_URL/custom_auth/repo.git" &&
@@ -298,11 +297,10 @@ test_expect_success 'access using basic auth with wwwauth header mixed line-endi
298297
299298
# Note that leading and trailing whitespace is important to correctly
300299
# simulate a continuation/folded header.
301-
printf "">$CHALLENGE &&
302-
printf "WWW-Authenticate: FooBar param1=\"value1\"\r\n" >$CHALLENGE &&
303-
printf " \r\n" >>$CHALLENGE &&
304-
printf "\tparam2=\"value2\"\r\n" >>$CHALLENGE &&
305-
printf "WWW-Authenticate: Basic realm=\"example.com\"" >>$CHALLENGE &&
300+
printf "WWW-Authenticate: FooBar param1=\"value1\"\r\n" >"$CHALLENGE" &&
301+
printf " \r\n" >>"$CHALLENGE" &&
302+
printf "\tparam2=\"value2\"\r\n" >>"$CHALLENGE" &&
303+
printf "WWW-Authenticate: Basic realm=\"example.com\"" >>"$CHALLENGE" &&
306304
307305
test_config_global credential.helper test-helper &&
308306
git ls-remote "$HTTPD_URL/custom_auth/repo.git" &&

0 commit comments

Comments
 (0)