diff options
author | Darrin Thompson <darrint@progeny.com> | 2005-07-13 04:12:40 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 02:48:45 +0200 |
commit | 3dcb90f526e63a46375c1e92d2511e0955e055ed (patch) | |
tree | f9781959a03f8f1bc644a66242cbbb1944e694de /git-fetch-script | |
parent | [PATCH] Install git-verify-tag-script (diff) | |
download | git-3dcb90f526e63a46375c1e92d2511e0955e055ed.tar.xz git-3dcb90f526e63a46375c1e92d2511e0955e055ed.zip |
[PATCH] Support more http features: https no cert, .netrc -> auth
Cause setting environment variable GIT_SSL_NO_VERIFY to turn off
curl's ssl peer verification.
Only use curl for http transfers, instead of curl and wget.
Make curl check ~/.netrc for credentials.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'git-fetch-script')
-rwxr-xr-x | git-fetch-script | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-fetch-script b/git-fetch-script index b44cf3f5a5..34ddfc8cb9 100755 --- a/git-fetch-script +++ b/git-fetch-script @@ -9,8 +9,11 @@ merge_store="$_remote_store" TMP_HEAD="$GIT_DIR/TMP_HEAD" case "$merge_repo" in -http://*) - head=$(wget -q -O - "$merge_repo/$merge_head") || exit 1 +http://* | https://*) + if [ -n "$GIT_SSL_NO_VERIFY" ]; then + curl_extra_args="-k" + fi + head=$(curl -ns $curl_extra_args "$merge_repo/$merge_head") || exit 1 echo Fetching "$merge_head" using http git-http-pull -v -a "$head" "$merge_repo/" ;; |