Split up git-pull-script into separate "fetch" and "merge" phases.

This allows you to just fetch stuff first, inspect it, and then
resolve the merge separately if everything looks good.

1 files changed, 41 insertions, 0 deletions

diff --git a/git-fetch-script b/git-fetch-script
new file mode 100755
index 0000000000..17f22afedd
--- /dev/null
+++ b/git-fetch-script
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+merge_repo=$1
+merge_name=${2:-HEAD}
+
+: ${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"
+download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD
+
+echo "Getting object database"
+download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)"