X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-fetch-script;h=34ddfc8cb9dd6171d23be1a534a66533c5bbb676;hb=b134922992e3051e7095b1e76a89361fea86206d;hp=fce43e6dc07c698eba292f5f07f9c24786280e0e;hpb=f170e4b39d87365cda17b80436ba6db4a2044e88;p=git.git diff --git a/git-fetch-script b/git-fetch-script index fce43e6d..34ddfc8c 100755 --- a/git-fetch-script +++ b/git-fetch-script @@ -9,10 +9,13 @@ 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 "$merge_head" "$merge_repo/" + git-http-pull -v -a "$head" "$merge_repo/" ;; rsync://*) rsync -L "$merge_repo/$merge_head" "$TMP_HEAD" || exit 1 @@ -29,6 +32,8 @@ git-rev-parse --verify "$head" > /dev/null || exit 1 case "$merge_store" in '') + ;; +*) echo "$head" > "$GIT_DIR/$merge_store" esac &&