undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
People are already starting to use a multi-head model.
This commit is contained in:
Linus Torvalds 2005-05-04 17:02:16 -07:00
parent 13019d4136
commit 552e2bd12e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-pull-script
View File

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