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

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-mirror · Jun 24, 2006 · 86378b3 · 86378b3
1 parent bc1f262
commit 86378b3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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