From: Junio C Hamano <junkio@cox.net>
Date: Sat, 3 Mar 2007 21:04:54 +0000 (-0800)
Subject: git-merge: fail correctly when we cannot fast forward.
X-Git-Tag: v1.5.0.3~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7d79c860a6e2a8ceee10039153b47f0a8580607d;p=git.git

git-merge: fail correctly when we cannot fast forward.

When we cannot fast forward the working tree and the current
branch, git-merge did not exit with non-zero status.

Noticed by Larry Streepy, the section to be fixed identfied by
Johannes Schindelin.

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

diff --git a/git-merge.sh b/git-merge.sh
index 498c938c4..4afcd9531 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -294,7 +294,7 @@ f,*)
 	git-update-index --refresh 2>/dev/null
 	new_head=$(git-rev-parse --verify "$1^0") &&
 	git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
-	finish "$new_head" "Fast forward"
+	finish "$new_head" "Fast forward" || exit
 	dropsave
 	exit 0
 	;;