@matheusbsbs / matheus-bagliano / commits / 2be08a84ba
Fork 0

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>

Santi Béjar committed Mar 16, 2007 at 11:46 UTC 2be08a84bae10a0c7ecf2ef921896ce838a6ed0b
1 file changed +2 -2
git-merge.sh
+2 -2
@@ -292,13 +292,13 @@ f,*)
292 # Again the most common case of merging one remote.
293 echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
294 git-update-index --refresh 2>/dev/null
295 - new_head=$(git-rev-parse --verify "$1^0") &&
296 - git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
295 msg="Fast forward"
296 if test -n "$have_message"
297 then
298 msg="$msg (no commit created; -m option ignored)"
299 fi
300 + new_head=$(git-rev-parse --verify "$1^0") &&
301 + git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
302 finish "$new_head" "$msg" || exit
303 dropsave
304 exit 0