mirror of
https://github.com/git/git
synced 2024-07-17 02:57:48 +00:00
41 lines
755 B
Bash
Executable file
41 lines
755 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
merge_repo=$1
|
|
merge_name=${2:-HEAD}
|
|
|
|
download_one () {
|
|
# remote_path="$1" local_file="$2"
|
|
case "$1" in
|
|
http://*)
|
|
wget -q -O "$2" "$1" ;;
|
|
/*)
|
|
test -f "$1" && cat >"$2" "$1" ;;
|
|
*)
|
|
rsync -L "$1" "$2" ;;
|
|
esac
|
|
}
|
|
|
|
download_objects () {
|
|
# remote_repo="$1" head_sha1="$2"
|
|
case "$1" in
|
|
http://*)
|
|
git-http-pull -a "$2" "$1/"
|
|
;;
|
|
/*)
|
|
git-local-pull -l -a "$2" "$1/"
|
|
;;
|
|
*)
|
|
rsync -avz --ignore-existing "$1/objects/." \
|
|
${SHA_FILE_DIRECTORY:-.git/objects}/.
|
|
;;
|
|
esac
|
|
}
|
|
|
|
echo "Getting remote $merge_name"
|
|
download_one "$merge_repo/$merge_name" .git/MERGE_HEAD
|
|
|
|
echo "Getting object database"
|
|
download_objects "$merge_repo" "$(cat .git/MERGE_HEAD)"
|
|
|
|
git-resolve-script "$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo"
|