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: Make fetch/pull scripts terminate cleanly on errors

Don't continue with a merge if the fetch failed.
---
 git-pull-script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git-pull-script')

diff --git a/git-pull-script b/git-pull-script
index 49f42b5ab2..a4ca97c645 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)" \
-- 
cgit v1.2.3