X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull-script;h=c31a65ca8c191b4b37784c7d398860baf3630cbc;hb=5dd02f9404e41055b4e7bb8106e9c58dcc524021;hp=4ec12bd887e0af896fdfaa1d30219d3e8ff070e8;hpb=635f67f9437b104be852cadb645006f4e858421f;p=git.git

diff --git a/git-pull-script b/git-pull-script
index 4ec12bd8..c31a65ca 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,26 +1,44 @@
 #!/bin/sh
 #
-merge_repo=$1
-
-merge_name=$(echo "$1" | sed 's:\.git/*$::')
-merge_head=HEAD
-type=head
-if [ "$2" = "tag" ]; then
-   type=tag
-   shift
-fi
-if [ "$2" ]
+# Copyright (c) 2005 Junio C Hamano
+#
+# Fetch one or more remote refs and merge it/them into the current HEAD.
+
+. git-sh-setup-script || die "Not a git archive"
+
+orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?"
+git-fetch-script --update-head-ok "$@" || exit 1
+
+curr_head=$(cat "$GIT_DIR/HEAD")
+if test "$curr_head" != "$orig_head"
 then
-   merge_name="$type '$2' of $merge_name"
-   merge_head="refs/{$type}s/$2"
+	# 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
 
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
+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' ' ')
 
-git-fetch-script "$merge_repo" "$merge_head" || exit 1
+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)" \
-	"$(cat "$GIT_DIR"/FETCH_HEAD)" \
-	"$merge_name"
+	$merge_head "Merge $merge_name"