[PATCH] Documentation for git-clone-dumb-http.

[git.git] / git-pull-script

diff --git a/git-pull-script b/git-pull-script
index d35a4a1..c31a65c 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,15 +1,44 @@
 #!/bin/sh
 #
-# use "$1" or something in a real script, this 
-# just hard-codes it.
+# Copyright (c) 2005 Junio C Hamano
 #
-merge_repo=$1
-merge_name=${2:-HEAD}
+# Fetch one or more remote refs and merge it/them into the current HEAD.
 
-echo "Getting object database"
-rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/.
+. git-sh-setup-script || die "Not a git archive"
 
-echo "Getting remote $merge_name"
-rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
+orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?"
+git-fetch-script --update-head-ok "$@" || exit 1
 
-git-resolve-script "$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo"
+curr_head=$(cat "$GIT_DIR/HEAD")
+if test "$curr_head" != "$orig_head"
+then
+       # The fetch involved updating the current branch.
+
+       # The working tree and the index file is still based on the
+       # $orig_head commit, but we are merging into $curr_head.
+       # First update the working tree to match $curr_head.
+
+       echo >&2 "Warning: fetch updated the current branch head."
+       echo >&2 "Warning: fast forwarding your working tree."
+       git-read-tree -u -m "$orig_head" "$curr_head" ||
+               die "You need to first update your working tree."
+fi
+
+merge_head=$(sed -e 's/        .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
+merge_name=$(sed -e 's/^[0-9a-f]*      //' "$GIT_DIR"/FETCH_HEAD |
+        tr '\012' ' ')
+
+case "$merge_head" in
+'')
+       echo >&2 "No changes."
+       exit 0
+       ;;
+*' '?*)
+       echo >&2 "Pulling more than one heads; making an Octopus."
+       exec git-octopus-script
+       ;;
+esac
+
+git-resolve-script \
+       "$(cat "$GIT_DIR"/HEAD)" \
+       $merge_head "Merge $merge_name"