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

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

git-pull: abort when fmt-merge-msg fails.
Signed-off-by: N Junio C Hamano <junkio@cox.net>
86378b32 · Junio C Hamano · bc1f262d · 86378b32
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

git-pull.sh git-pull.sh +1 -1

未找到文件。
--- 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