X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-fetch-script;h=a0326f0e789145ee93f188d5bb3855d8a029bd6b;hb=24db845c40b09c55eb810c01e7fda2f4505d35ba;hp=fce43e6dc07c698eba292f5f07f9c24786280e0e;hpb=98e031f0bb6e857c684e6db24d03d22cfc1a532a;p=git.git

diff --git a/git-fetch-script b/git-fetch-script
index fce43e6d..a0326f0e 100755
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -9,10 +9,19 @@ 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
+	_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' &&
+	_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" &&
+	head=$(curl -ns $curl_extra_args "$merge_repo/$merge_head") &&
+	expr "$head" : "$_x40\$" >/dev/null || {
+		echo >&2 "Failed to fetch $merge_head from $merge_repo"
+	        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/" || exit
 	;;
 rsync://*)
 	rsync -L "$merge_repo/$merge_head" "$TMP_HEAD" || exit 1
@@ -29,6 +38,8 @@ git-rev-parse --verify "$head" > /dev/null || exit 1
 
 case "$merge_store" in
 '')
+	;;
+*)
 	echo "$head" > "$GIT_DIR/$merge_store"
 esac &&