summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-03 21:04:54 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-03 21:04:54 (GMT)
commit7d79c860a6e2a8ceee10039153b47f0a8580607d (patch)
tree44e8371528b304b0cf8eaa65097006f8a7867876 /git-merge.sh
parent64edf4b2eb19e5b94eda60c0e21d85e45602a8f1 (diff)
downloadgit-7d79c860a6e2a8ceee10039153b47f0a8580607d.zip
git-7d79c860a6e2a8ceee10039153b47f0a8580607d.tar.gz
git-7d79c860a6e2a8ceee10039153b47f0a8580607d.tar.bz2
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>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 498c938..4afcd95 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
;;