@matheusbsbs / matheus-bagliano / commits / 86378b3289
Fork 0

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

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

Junio C Hamano committed Jun 24, 2006 at 01:10 UTC 86378b32895ee5d788491b8407608a54e5cf064c
1 file changed +1 -1
git-pull.sh
+1 -1
@@ -99,5 +99,5 @@ case "$strategy_args" in
99 ;;
100 esac
101
102 -merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
102 +merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
103 git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head