X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=git-pull-script;h=0585df61e241b302cf007cd75dd6e9fd3b78596a;hb=a4acb0eb140d80141ac564a09219a10c3ab76449;hp=78d2f3df346b7b8d24b3dbe28a244b8d0ba141e7;hpb=cc167ccaeb1adcdc392f9e03ed1225762ea3cf96;p=git.git

diff --git a/git-pull-script b/git-pull-script
index 78d2f3df..0585df61 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -3,38 +3,12 @@
 merge_repo=$1
 merge_name=${2:-HEAD}
 
-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
-}
+: ${GIT_DIR=.git}
+: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
 
-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/." \
-			${SHA_FILE_DIRECTORY:-.git/objects}/.
-		;;
-	esac
-}
+git-fetch-script "$merge_repo" "$merge_name"
 
-echo "Getting remote $merge_name"
-download_one "$merge_repo/$merge_name" .git/MERGE_HEAD
-
-echo "Getting object database"
-download_objects "$merge_repo" "$(cat .git/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"