diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-29 19:53:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-29 19:53:54 (GMT) |
| commit | e2b7eaf0ca3897940961d23392d4ff718867ea9f (patch) | |
| tree | bf24e41872b28f8dc50db5f24e0222117da71da6 /git-ls-remote.sh | |
| parent | 8371d8fd094548c1d02b8583fdbff8204a725ffc (diff) | |
| parent | e720c4382f6c9317a3b495e80c7dfc609a0db5e6 (diff) | |
| download | git-e2b7eaf0ca3897940961d23392d4ff718867ea9f.zip git-e2b7eaf0ca3897940961d23392d4ff718867ea9f.tar.gz git-e2b7eaf0ca3897940961d23392d4ff718867ea9f.tar.bz2 | |
Merge branch 'maint'
* maint:
RelNotes-1.5.3.5: describe recent fixes
merge-recursive.c: mrtree in merge() is not used before set
sha1_file.c: avoid gcc signed overflow warnings
Fix a small memory leak in builtin-add
honor the http.sslVerify option in shell scripts
Diffstat (limited to 'git-ls-remote.sh')
| -rwxr-xr-x | git-ls-remote.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-ls-remote.sh b/git-ls-remote.sh index d56cf92..fec70bb 100755 --- a/git-ls-remote.sh +++ b/git-ls-remote.sh @@ -54,9 +54,10 @@ tmpdir=$tmp-d case "$peek_repo" in http://* | https://* | ftp://* ) - if [ -n "$GIT_SSL_NO_VERIFY" ]; then - curl_extra_args="-k" - fi + if [ -n "$GIT_SSL_NO_VERIFY" -o \ + "`git config --bool http.sslVerify`" = false ]; then + curl_extra_args="-k" + fi if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \ "`git config --bool http.noEPSV`" = true ]; then curl_extra_args="${curl_extra_args} --disable-epsv" |