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

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago · 86378b3289
1 changed files with 1 additions and 1 deletions
--- a/git-pull.sh
+++ b/git-pull.sh
@ -99,5 +99,5 @@ case "$strategy_args" in
				@@ -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