From ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 6 Jun 2005 17:40:22 -0700
Subject: [PATCH] Make fetch/pull scripts terminate cleanly on errors

Don't continue with a merge if the fetch failed.
---
 git-fetch-script | 4 ++--
 git-pull-script  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/git-fetch-script b/git-fetch-script
index 17f22afed..7cd88b93b 100755
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -35,7 +35,7 @@ download_objects () {
 }
 
 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
diff --git a/git-pull-script b/git-pull-script
index 49f42b5ab..a4ca97c64 100755
--- 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)" \
-- 
2.26.2