aboutsummaryrefslogtreecommitdiff
path: root/git-pull-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-06 01:12:04 -0700
committerJunio C Hamano <junkio@cox.net>2005-05-06 01:12:04 -0700
commitcc167ccaeb1adcdc392f9e03ed1225762ea3cf96 (patch)
tree376740460dad7f30aa6387934f77bd13fcff1b00 /git-pull-script
parent4df1e7950787197f7cad081b98f9ffe6c4089fc9 (diff)
downloadgit-cc167ccaeb1adcdc392f9e03ed1225762ea3cf96.tar.gz
git-cc167ccaeb1adcdc392f9e03ed1225762ea3cf96.tar.xz
Add http and local transport support for git-pull-script.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull-script')
-rwxr-xr-xgit-pull-script37
1 files changed, 31 insertions, 6 deletions
diff --git a/git-pull-script b/git-pull-script
index d35a4a1b2..78d2f3df3 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,15 +1,40 @@
#!/bin/sh
#
-# use "$1" or something in a real script, this
-# just hard-codes it.
-#
merge_repo=$1
merge_name=${2:-HEAD}
-echo "Getting object database"
-rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/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/." \
+ ${SHA_FILE_DIRECTORY:-.git/objects}/.
+ ;;
+ esac
+}
echo "Getting remote $merge_name"
-rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
+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"