write-tree is now willing to write empty tree

[git.git] / git-pull-script

diff --git a/git-pull-script b/git-pull-script
index 77d68d7..78d2f3d 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,48 +1,40 @@
 #!/bin/sh
 #
-# use "$1" or something in a real script, this 
-# just hard-codes it.
-#
 merge_repo=$1
+merge_name=${2:-HEAD}
 
-rm -f .git/MERGE_HEAD
-
-echo "Getting object database"
-rsync -avz --ignore-existing $merge_repo/objects/. .git/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
+}
 
-echo "Getting remote head"
-rsync -L $merge_repo/HEAD .git/MERGE_HEAD || 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
+}
 
-head=$(cat .git/HEAD)
-merge_head=$(cat .git/MERGE_HEAD)
-common=$(merge-base $head $merge_head)
-if [ -z "$common" ]; then
-       echo "Unable to find common commit between" $merge_head $head
-       exit 1
-fi
+echo "Getting remote $merge_name"
+download_one "$merge_repo/$merge_name" .git/MERGE_HEAD
 
-# Get the trees associated with those commits
-common_tree=$(cat-file commit $common | sed 's/tree //;q')
-head_tree=$(cat-file commit $head | sed 's/tree //;q')
-merge_tree=$(cat-file commit $merge_head | sed 's/tree //;q')
+echo "Getting object database"
+download_objects "$merge_repo" "$(cat .git/MERGE_HEAD)"
 
-if [ "$common" == "$merge_head" ]; then
-       echo "Already up-to-date. Yeeah!"
-       exit 0
-fi
-if [ "$common" == "$head" ]; then
-       echo "Updating from $head to $merge_head."
-       echo "Destroying all noncommitted data!"
-       echo "Kill me within 3 seconds.."
-       sleep 3
-       read-tree -m $merge_tree && checkout-cache -f -a && update-cache --refresh
-       echo $merge_head > .git/HEAD
-       exit 0
-fi
-echo "Trying to merge $merge_head into $head"
-read-tree -m $common_tree $head_tree $merge_tree
-result_tree=$(write-tree) || exit 1
-result_commit=$(echo "Merge $merge_repo" | commit-tree $result_tree -p $head -p $merge_head)
-echo "Committed merge $result_commit"
-echo $result_commit > .git/HEAD
-checkout-cache -f -a && update-cache --refresh
+git-resolve-script "$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo"