test format-patch -s: make sure MIME content type is shown as needed

diff --git a/git-ls-remote.sh b/git-ls-remote.sh
index d56cf92ebfa685fd724a47e1ca753f0735dbd5bd..fec70bbf88c614a2dadfc40950fdd7abdf7f2c63 100755 (executable)
--- 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"