diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 17:02:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 17:02:16 -0700 |
| commit | 552e2bd12ee7b3a73345f64cf66b2ce67d9d98dd (patch) | |
| tree | 8ab6d51f6b156300a8c67a81f4a9558840ebc96a /git-pull-script | |
| parent | 13019d413647c4fbd3bb1564bbdf0d934c0a74d7 (diff) | |
| download | git-552e2bd12ee7b3a73345f64cf66b2ce67d9d98dd.tar.gz git-552e2bd12ee7b3a73345f64cf66b2ce67d9d98dd.tar.xz | |
Teach "git-pull-script" about alternate HEAD's to pull..
People are already starting to use a multi-head model.
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 5 |
1 files changed, 3 insertions, 2 deletions
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) |