author | Junio C Hamano <junkio@cox.net> | |
Sat, 17 Mar 2007 07:33:17 +0000 (00:33 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 17 Mar 2007 07:33:17 +0000 (00:33 -0700) |
* maint:
git-merge: finish when git-read-tree fails
git-merge: finish when git-read-tree fails
git-merge.sh | patch | blob | history |
diff --git a/git-merge.sh b/git-merge.sh
index 6ce62c860a3732e1239e216fb7492a126216be67..8759c5a7e0f8748108d6eff005cde1e0893f3592 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
# Again the most common case of merging one remote.
echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
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" &&
msg="Fast forward"
if test -n "$have_message"
then
msg="$msg (no commit created; -m option ignored)"
fi
+ new_head=$(git-rev-parse --verify "$1^0") &&
+ git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
finish "$new_head" "$msg" || exit
dropsave
exit 0