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

diff --git a/git-fetch-script b/git-fetch-script
index acb1e56e..a0326f0e 100755
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -1,33 +1,50 @@
 #!/bin/sh
 #
-destination=FETCH_HEAD
-
-merge_repo=$1
-merge_name=${2:-HEAD}
-if [ "$2" = "tag" ]; then
-	merge_name="refs/tags/$3"
-	destination="$merge_name"
-fi
-
 . git-sh-setup-script || die "Not a git archive"
+. git-parse-remote "$@"
+merge_repo="$_remote_repo"
+merge_head="$_remote_head"
+merge_store="$_remote_store"
 
 TMP_HEAD="$GIT_DIR/TMP_HEAD"
 
 case "$merge_repo" in
-http://*)
-	head=$(wget -q -O - "$merge_repo/$merge_name") || exit 1
-	echo Fetching $head using http
-	git-http-pull -v -a "$head" "$merge_repo/"
+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 "$head" "$merge_repo/" || exit
 	;;
 rsync://*)
-	rsync -L "$merge_repo/$merge_name" "$TMP_HEAD" || exit 1
+	rsync -L "$merge_repo/$merge_head" "$TMP_HEAD" || exit 1
 	head=$(git-rev-parse TMP_HEAD)
 	rm -f "$TMP_HEAD"
 	rsync -avz --ignore-existing "$merge_repo/objects/" "$GIT_OBJECT_DIRECTORY/"
 	;;
 *)
-	head=$(git-fetch-pack "$merge_repo" "$merge_name")
+	head=$(git-fetch-pack "$merge_repo" "$merge_head")
 	;;
 esac || exit 1
+
 git-rev-parse --verify "$head" > /dev/null || exit 1
-echo "$head" > "$GIT_DIR/$destination"
+
+case "$merge_store" in
+'')
+	;;
+*)
+	echo "$head" > "$GIT_DIR/$merge_store"
+esac &&
+
+# FETCH_HEAD is fed to git-resolve-script which will eventually be
+# passed to git-commit-tree as one of the parents.  Make sure we do
+# not give a tag object ID.
+
+git-rev-parse "$head^0" >"$GIT_DIR/FETCH_HEAD"