X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull-script;h=c31a65ca8c191b4b37784c7d398860baf3630cbc;hb=debb9d84445239ffbc630611548af630fb8e1e7a;hp=e7e82f49d2a243060dfc653dad200675f8336688;hpb=552e2bd12ee7b3a73345f64cf66b2ce67d9d98dd;p=git.git

diff --git a/git-pull-script b/git-pull-script
index e7e82f49..c31a65ca 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,58 +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.
 
-rm -f .git/MERGE_HEAD .git/ORIG_HEAD
-cp .git/HEAD .git/ORIG_HEAD
+. git-sh-setup-script || die "Not a git archive"
 
-echo "Getting object database"
-rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/.
+orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?"
+git-fetch-script --update-head-ok "$@" || exit 1
 
-echo "Getting remote $merge_name"
-rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
+curr_head=$(cat "$GIT_DIR/HEAD")
+if test "$curr_head" != "$orig_head"
+then
+	# The fetch involved updating the current branch.
 
-head=$(cat .git/HEAD)
-merge_head=$(cat .git/MERGE_HEAD)
-common=$(git-merge-base $head $merge_head)
-if [ -z "$common" ]; then
-	echo "Unable to find common commit between" $merge_head $head
-	exit 1
+	# 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
 
-# Get the trees associated with those commits
-common_tree=$(git-cat-file commit $common | sed 's/tree //;q')
-head_tree=$(git-cat-file commit $head | sed 's/tree //;q')
-merge_tree=$(git-cat-file commit $merge_head | sed 's/tree //;q')
+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' ' ')
 
-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
-	git-read-tree -m $merge_tree && git-checkout-cache -f -a && git-update-cache --refresh
-	echo $merge_head > .git/HEAD
+case "$merge_head" in
+'')
+	echo >&2 "No changes."
 	exit 0
-fi
-echo "Trying to merge $merge_head into $head"
-git-read-tree -m $common_tree $head_tree $merge_tree
-merge_msg="Merge of $merge_repo"
-result_tree=$(git-write-tree  2> /dev/null)
-if [ $? -ne 0 ]; then
-	echo "Simple merge failed, trying Automatic merge"
-	git-merge-cache git-merge-one-file-script -a
-	merge_msg="Automatic merge of $merge_repo"
-	result_tree=$(git-write-tree) || exit 1
-fi
-result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge_head)
-echo "Committed merge $result_commit"
-echo $result_commit > .git/HEAD
-git-checkout-cache -f -a && git-update-cache --refresh
-git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
+	;;
+*' '?*)
+	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"