Make fetch/pull scripts terminate cleanly on errors

diff --git a/git-pull-script b/git-pull-script
index bd892c7bbc8b236d46b19444d94e2c023410f4d5..a4ca97c64566419a0dc02e8e719333d1c9240edc 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,46 +1,23 @@
 #!/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
-}
+merge_name=$(echo "$1" | sed 's:\.git/*$::')
+merge_head=HEAD
+if [ "$2" ]
+then
+   merge_name="'$2' branch from
 
-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
-}
+       $merge_name"
+   merge_head="refs/heads/$2"
+fi
 
-echo "Getting remote $merge_name"
-download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD
+: ${GIT_DIR=.git}
+: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
 
-echo "Getting object database"
-download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)"
+git-fetch-script "$merge_repo" "$merge_head" || exit 1
 
 git-resolve-script \
        "$(cat "$GIT_DIR"/HEAD)" \
        "$(cat "$GIT_DIR"/MERGE_HEAD)" \
-       "$merge_repo"
+       "$merge_name"