X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-pull-script;h=bd892c7bbc8b236d46b19444d94e2c023410f4d5;hb=d6db01075b65da2b8584a0450619390893aae103;hp=d35a4a1b23bb8af7a13cb07937a0d667ee75fde4;hpb=67cc5c4ef8b84961946e58bfb896c11b7fd33cc7;p=git.git

diff --git a/git-pull-script b/git-pull-script
index d35a4a1b..bd892c7b 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,15 +1,46 @@
 #!/bin/sh
 #
-# use "$1" or something in a real script, this 
-# just hard-codes it.
-#
 merge_repo=$1
 merge_name=${2:-HEAD}
 
-echo "Getting object database"
-rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/.
+: ${GIT_DIR=.git}
+: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
+
+download_one () {
+	# remote_path="$1" local_file="$2"
+	case "$1" in
+	http://*)
+		wget -q -O "$2" "$1" ;;
+	/*)
+		test -f "$1" && cat >"$2" "$1" ;;
+	*)
+		rsync -L "$1" "$2" ;;
+	esac
+}
+
+download_objects () {
+	# remote_repo="$1" head_sha1="$2"
+	case "$1" in
+	http://*)
+		git-http-pull -a "$2" "$1/"
+		;;
+	/*)
+		git-local-pull -l -a "$2" "$1/"
+		;;
+	*)
+		rsync -avz --ignore-existing \
+			"$1/objects/." "$GIT_OBJECT_DIRECTORY"/.
+		;;
+	esac
+}
 
 echo "Getting remote $merge_name"
-rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
+download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD
+
+echo "Getting object database"
+download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)"
 
-git-resolve-script "$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo"
+git-resolve-script \
+	"$(cat "$GIT_DIR"/HEAD)" \
+	"$(cat "$GIT_DIR"/MERGE_HEAD)" \
+	"$merge_repo"