Make fetch/pull scripts terminate cleanly on errors
Don't continue with a merge if the fetch failed.
diff --git a/git-fetch-script b/git-fetch-script
index 17f22af..7cd88b9 100755
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -35,7 +35,7 @@
}
echo "Getting remote $merge_name"
-download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD
+download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD || exit 1
echo "Getting object database"
-download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)"
+download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)" || exit 1