mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
git-merge: finish when git-read-tree fails
The message formating (commit v1.5.0.3-28-gbe242d5) broke the && chain. Noticed by Dmitry Torokhov. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
3d4e1932f2
commit
2be08a84ba
|
@ -292,13 +292,13 @@ f,*)
|
||||||
# Again the most common case of merging one remote.
|
# Again the most common case of merging one remote.
|
||||||
echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
|
echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
|
||||||
git-update-index --refresh 2>/dev/null
|
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"
|
msg="Fast forward"
|
||||||
if test -n "$have_message"
|
if test -n "$have_message"
|
||||||
then
|
then
|
||||||
msg="$msg (no commit created; -m option ignored)"
|
msg="$msg (no commit created; -m option ignored)"
|
||||||
fi
|
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
|
finish "$new_head" "$msg" || exit
|
||||||
dropsave
|
dropsave
|
||||||
exit 0
|
exit 0
|
||||||
|
|
Loading…
Reference in a new issue