X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-pull-script;h=49f42b5ab2896356952aee9eb2b771f422011f02;hb=000182eacf99cde27d5916aa415921924b82972c;hp=78d2f3df346b7b8d24b3dbe28a244b8d0ba141e7;hpb=cc167ccaeb1adcdc392f9e03ed1225762ea3cf96;p=git.git

diff --git a/git-pull-script b/git-pull-script
index 78d2f3df..49f42b5a 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,40 +1,23 @@
 #!/bin/sh
 #
 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
-}
+merge_name=$(echo "$1" | sed 's:\.git/*$::')
+merge_head=HEAD
+if [ "$2" ]
+then
+   merge_name="'$2' branch from
 
-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
-}
+	$merge_name"
+   merge_head="refs/heads/$2"
+fi
 
-echo "Getting remote $merge_name"
-download_one "$merge_repo/$merge_name" .git/MERGE_HEAD
+: ${GIT_DIR=.git}
+: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
 
-echo "Getting object database"
-download_objects "$merge_repo" "$(cat .git/MERGE_HEAD)"
+git-fetch-script "$merge_repo" "$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_name"