From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 5 May 2005 00:02:16 +0000 (-0700)
Subject: Teach "git-pull-script" about alternate HEAD's to pull..
X-Git-Tag: v0.99~649
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=552e2bd12ee7b3a73345f64cf66b2ce67d9d98dd;p=git.git

Teach "git-pull-script" about alternate HEAD's to pull..

People are already starting to use a multi-head model.
---

diff --git a/git-pull-script b/git-pull-script
index 9315426e7..e7e82f49d 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -4,6 +4,7 @@
 # just hard-codes it.
 #
 merge_repo=$1
+merge_name=${2:-HEAD}
 
 rm -f .git/MERGE_HEAD .git/ORIG_HEAD
 cp .git/HEAD .git/ORIG_HEAD
@@ -11,8 +12,8 @@ cp .git/HEAD .git/ORIG_HEAD
 echo "Getting object database"
 rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/.
 
-echo "Getting remote head"
-rsync -L $merge_repo/HEAD .git/MERGE_HEAD || exit 1
+echo "Getting remote $merge_name"
+rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
 
 head=$(cat .git/HEAD)
 merge_head=$(cat .git/MERGE_HEAD)