зеркало из https://github.com/microsoft/git.git
git-pull: abort when fmt-merge-msg fails.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
bc1f262d67
Коммит
86378b3289
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче