mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
7ef76925d9
This allows you to just fetch stuff first, inspect it, and then resolve the merge separately if everything looks good.
41 lines
766 B
Bash
Executable file
41 lines
766 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
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
|
|
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/." "$GIT_OBJECT_DIRECTORY"/.
|
|
;;
|
|
esac
|
|
}
|
|
|
|
echo "Getting remote $merge_name"
|
|
download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD
|
|
|
|
echo "Getting object database"
|
|
download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)"
|