diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-03 13:04:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-03 13:04:54 -0800 |
| commit | 7d79c860a6e2a8ceee10039153b47f0a8580607d (patch) | |
| tree | 44e8371528b304b0cf8eaa65097006f8a7867876 | |
| parent | builtin-archive: use RUN_SETUP (diff) | |
| download | tgif-7d79c860a6e2a8ceee10039153b47f0a8580607d.tar.xz | |
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>
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 498c938c45..4afcd95316 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 ;; |