From 86378b32895ee5d788491b8407608a54e5cf064c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 24 Jun 2006 01:10:27 -0700 Subject: [PATCH] git-pull: abort when fmt-merge-msg fails. Signed-off-by: Junio C Hamano --- git-pull.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-pull.sh b/git-pull.sh index 4611ae644e..bdd3939923 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 -- 2.11.4.GIT