diff options
| author | Petr Baudis <pasky@ucw.cz> | 2005-05-11 02:00:49 +0200 |
|---|---|---|
| committer | Petr Baudis <xpasky@machine.sinus.cz> | 2005-05-11 02:00:49 +0200 |
| commit | f1a7eb36b017c62d9a007b6b8660bdeec3f94f97 (patch) | |
| tree | 9d9c288e2db202401ffba37a1b921f4244a79b2b /git-pull-script | |
| parent | 883550481f885ab2865ab71819167230d21d4c14 (diff) | |
| parent | b790abb874890926e4cfda552bfa89d1d4ff972b (diff) | |
| download | git-f1a7eb36b017c62d9a007b6b8660bdeec3f94f97.tar.xz | |
Merge with http://members.cox.net/junkio/git-jc.git
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/git-pull-script b/git-pull-script index 78d2f3df34..bd892c7bbc 100755 --- a/git-pull-script +++ b/git-pull-script @@ -3,6 +3,9 @@ merge_repo=$1 merge_name=${2:-HEAD} +: ${GIT_DIR=.git} +: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"} + download_one () { # remote_path="$1" local_file="$2" case "$1" in @@ -25,16 +28,19 @@ download_objects () { git-local-pull -l -a "$2" "$1/" ;; *) - rsync -avz --ignore-existing "$1/objects/." \ - ${SHA_FILE_DIRECTORY:-.git/objects}/. + rsync -avz --ignore-existing \ + "$1/objects/." "$GIT_OBJECT_DIRECTORY"/. ;; esac } echo "Getting remote $merge_name" -download_one "$merge_repo/$merge_name" .git/MERGE_HEAD +download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD echo "Getting object database" -download_objects "$merge_repo" "$(cat .git/MERGE_HEAD)" +download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)" -git-resolve-script "$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo" +git-resolve-script \ + "$(cat "$GIT_DIR"/HEAD)" \ + "$(cat "$GIT_DIR"/MERGE_HEAD)" \ + "$merge_repo" |