Skip to content

Commit 86378b3

Browse files
author
Junio C Hamano
committed
git-pull: abort when fmt-merge-msg fails.
Signed-off-by: Junio C Hamano <[email protected]>
1 parent bc1f262 commit 86378b3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-pull.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,5 @@ case "$strategy_args" in
9999
;;
100100
esac
101101

102-
merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
102+
merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
103103
git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head

0 commit comments

Comments
 (0)