blob: 78d2f3df346b7b8d24b3dbe28a244b8d0ba141e7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
#!/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"
|
