diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2020-04-20 02:24:14 +0300 |
---|---|---|
committer | Jonathan Nieder <jrnieder@gmail.com> | 2020-04-20 02:24:14 +0300 |
commit | ba6f0905fdb9e65c1ac5fbc79c9a4ef0b59b3e68 (patch) | |
tree | 568cffa77566b7b50fed2a7db52f89cf26016ef2 /t/t5550-http-fetch-dumb.sh | |
parent | 21a3e5016bb218dc9b016284c88ba685bc446b70 (diff) | |
parent | df5be6dc3fd18c294ec93a9af0321334e3f92c9c (diff) |
Git 2.18.4v2.18.4
This merges up the security fix from v2.17.5.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 't/t5550-http-fetch-dumb.sh')
-rwxr-xr-x | t/t5550-http-fetch-dumb.sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh index 6d7d88ccc9..bf9ca5a8ec 100755 --- a/t/t5550-http-fetch-dumb.sh +++ b/t/t5550-http-fetch-dumb.sh @@ -321,11 +321,17 @@ test_expect_success 'git client does not send an empty Accept-Language' ' ' test_expect_success 'remote-http complains cleanly about malformed urls' ' - # do not actually issue "list" or other commands, as we do not - # want to rely on what curl would actually do with such a broken - # URL. This is just about making sure we do not segfault during - # initialization. - test_must_fail git remote-http http::/example.com/repo.git + test_must_fail git remote-http http::/example.com/repo.git 2>stderr && + test_i18ngrep "url has no scheme" stderr +' + +# NEEDSWORK: Writing commands to git-remote-curl can race against the latter +# erroring out, producing SIGPIPE. Remove "ok=sigpipe" once transport-helper has +# learned to handle early remote helper failures more cleanly. +test_expect_success 'remote-http complains cleanly about empty scheme' ' + test_must_fail ok=sigpipe git ls-remote \ + http::${HTTPD_URL#http}/dumb/repo.git 2>stderr && + test_i18ngrep "url has no scheme" stderr ' test_expect_success 'redirects can be forbidden/allowed' ' |