X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-fetch-script;h=ea097144f712f9ef1beb0531f1bf945db9485c3f;hb=3e386508f87278610d1892aaaa08cd17907f71c5;hp=34ddfc8cb9dd6171d23be1a534a66533c5bbb676;hpb=3dcb90f526e63a46375c1e92d2511e0955e055ed;p=git.git

diff --git a/git-fetch-script b/git-fetch-script
index 34ddfc8c..ea097144 100755
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -13,9 +13,15 @@ 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
+	_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 -nsf $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 "$head" "$merge_repo/"
+	git-http-pull -v -a "$head" "$merge_repo/" || exit
 	;;
 rsync://*)
 	rsync -L "$merge_repo/$merge_head" "$TMP_HEAD" || exit 1
@@ -25,6 +31,10 @@ rsync://*)
 	;;
 *)
 	head=$(git-fetch-pack "$merge_repo" "$merge_head")
+	if h=`expr "$head" : '\([^ ][^ ]*\) '`
+	then
+	    head=$h
+	fi
 	;;
 esac || exit 1