Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-merge: finish when git-read-tree fails
author
Santi Béjar
<sbejar@gmail.com>
Fri, 16 Mar 2007 10:46:09 +0000
(11:46 +0100)
committer
Junio C Hamano
<junkio@cox.net>
Fri, 16 Mar 2007 11:34:17 +0000
(
04:34
-0700)
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>
git-merge.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
3d4e193
)
diff --git
a/git-merge.sh
b/git-merge.sh
index 6ce62c860a3732e1239e216fb7492a126216be67..8759c5a7e0f8748108d6eff005cde1e0893f3592 100755
(executable)
--- 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
# 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
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
finish "$new_head" "$msg" || exit
dropsave
exit 0