Merge my and Petr's git-merge-one-file-script modifications

diff --git a/git-pull-script b/git-pull-script
index d35a4a1b23bb8af7a13cb07937a0d667ee75fde4..dbef56c70b7e40c69517c3ede33544d0e9efcc8a 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,15 +1,21 @@
 #!/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}/.
+merge_name=$(echo "$1" | sed 's:\.git/*$::')
+merge_head=HEAD
+if [ "$2" ]
+then
+   merge_name="'$2' branch of $merge_name"
+   merge_head="refs/heads/$2"
+fi
+
+: ${GIT_DIR=.git}
+: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
 
-echo "Getting remote $merge_name"
-rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
+git-fetch-script "$merge_repo" "$merge_head" || exit 1
 
-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"