From: Junio C Hamano <junkio@cox.net>
Date: Sat, 24 Jun 2006 08:10:27 +0000 (-0700)
Subject: git-pull: abort when fmt-merge-msg fails.
X-Git-Tag: v1.4.1-rc2~33
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=86378b32895ee5d788491b8407608a54e5cf064c;p=git.git

git-pull: abort when fmt-merge-msg fails.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-pull.sh b/git-pull.sh
index 4611ae644..bdd393992 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -99,5 +99,5 @@ case "$strategy_args" in
 	;;
 esac
 
-merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
+merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
 git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head