From: Junio C Hamano <junkio@cox.net>
Date: Tue, 23 Aug 2005 04:57:59 +0000 (-0700)
Subject: [PATCH] Use git-octopus when pulling more than one heads.
X-Git-Tag: v0.99.5~2^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=521003ff52d1cf742350e1342bc2dd4ab1b51e6b;p=git.git

[PATCH] Use git-octopus when pulling more than one heads.

With this, you can finally say "git pull jgarzik sil24 pdc2027x".

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-pull-script b/git-pull-script
index 8608fcdeb..7016fbf94 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,5 +1,9 @@
 #!/bin/sh
 #
+# 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"
 git-fetch-script "$@" || exit 1
 merge_head=$(sed -e 's/	.*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
@@ -7,10 +11,16 @@ merge_name=$(sed -e 's/^[0-9a-f]*	//' "$GIT_DIR"/FETCH_HEAD |
 	 tr '\012' ' ')
 
 case "$merge_head" in
-'' | *' '?*) die "Cannot resolve multiple heads at the same time (yet)." ;;
+'')
+	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"