summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorSanti Béjar <sbejar@gmail.com>2007-03-16 10:46:09 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-16 11:34:17 (GMT)
commit2be08a84bae10a0c7ecf2ef921896ce838a6ed0b (patch)
tree9d1acbc2838690495a2e002f902cf5e88b475176 /git-merge.sh
parent3d4e1932f24346d26f15e98dd6a74798035e7870 (diff)
downloadgit-2be08a84bae10a0c7ecf2ef921896ce838a6ed0b.zip
git-2be08a84bae10a0c7ecf2ef921896ce838a6ed0b.tar.gz
git-2be08a84bae10a0c7ecf2ef921896ce838a6ed0b.tar.bz2
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>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 6ce62c8..8759c5a 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -292,13 +292,13 @@ f,*)
# 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