summaryrefslogtreecommitdiff
path: root/git-pull-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-23 04:57:59 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-24 23:50:52 (GMT)
commit521003ff52d1cf742350e1342bc2dd4ab1b51e6b (patch)
tree40f848b88cb8ffc9fccf7e1488582751705b2fe5 /git-pull-script
parentae2da40690a3f3f101de5780a7799781b09e2e05 (diff)
downloadgit-521003ff52d1cf742350e1342bc2dd4ab1b51e6b.zip
git-521003ff52d1cf742350e1342bc2dd4ab1b51e6b.tar.gz
git-521003ff52d1cf742350e1342bc2dd4ab1b51e6b.tar.bz2
[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>
Diffstat (limited to 'git-pull-script')
-rwxr-xr-xgit-pull-script14
1 files changed, 12 insertions, 2 deletions
diff --git a/git-pull-script b/git-pull-script
index 8608fcd..7016fbf 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"