Add a "git rename" to help with - surprise surprise - renames

diff --git a/git-pull-script b/git-pull-script
index 78d2f3df346b7b8d24b3dbe28a244b8d0ba141e7..fc463260bd9dd07e50494e7cbb39ef6833179ff3 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,40 +1,12 @@
 #!/bin/sh
 #
-merge_repo=$1
-merge_name=${2:-HEAD}
+. git-sh-setup-script || die "Not a git archive"
+. git-parse-remote "$@"
+merge_name="$_remote_name"
 
-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-fetch-script "$@" || exit 1
 
-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
-}
-
-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"/FETCH_HEAD)" \
+       "Merge $merge_name"