Make fetch/pull scripts terminate cleanly on errors

diff --git a/git-pull-script b/git-pull-script
index 49f42b5ab2896356952aee9eb2b771f422011f02..a4ca97c64566419a0dc02e8e719333d1c9240edc 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -15,7 +15,7 @@ fi
 : ${GIT_DIR=.git}
 : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
 
-git-fetch-script "$merge_repo" "$merge_head"
+git-fetch-script "$merge_repo" "$merge_head" || exit 1
 
 git-resolve-script \
        "$(cat "$GIT_DIR"/HEAD)" \