7 # remote_path="$1" local_file="$2"
10 wget
-q -O "$2" "$1" ;;
12 test -f "$1" && cat >"$2" "$1" ;;
19 # remote_repo="$1" head_sha1="$2"
22 git-http-pull
-a "$2" "$1/"
25 git-local-pull
-l -a "$2" "$1/"
28 rsync
-avz --ignore-existing "$1/objects/." \
29 ${SHA_FILE_DIRECTORY:-.git/objects}/.
34 echo "Getting remote $merge_name"
35 download_one
"$merge_repo/$merge_name" .git
/MERGE_HEAD
37 echo "Getting object database"
38 download_objects
"$merge_repo" "$(cat .git/MERGE_HEAD)"
40 git-resolve-script
"$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo"