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

People are already starting to use a multi-head model.
git-mirror · May 5, 2005 · 552e2bd · 552e2bd
1 parent 13019d4
commit 552e2bd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/git-pull-script b/git-pull-script
@@ -4,15 +4,16 @@
 # 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
 
 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)