projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GIT-VERSION-GEN: squelch unneeded error from "cat version"
[git.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index
0a158ef
..
7be9e81
100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-13,6
+13,10
@@
LF='
all_strategies='recursive octopus resolve stupid ours'
default_strategies='recursive'
use_strategies=
all_strategies='recursive octopus resolve stupid ours'
default_strategies='recursive'
use_strategies=
+if test "@@NO_PYTHON@@"; then
+ all_strategies='resolve octopus stupid ours'
+ default_strategies='resolve'
+fi
dropsave() {
rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
dropsave() {
rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
@@
-130,7
+134,7
@@
case "$#,$common,$no_commit" in
echo "Updating from $head to $1."
git-update-index --refresh 2>/dev/null
new_head=$(git-rev-parse --verify "$1^0") &&
echo "Updating from $head to $1."
git-update-index --refresh 2>/dev/null
new_head=$(git-rev-parse --verify "$1^0") &&
- git-read-tree -u -m $head "$new_head" &&
+ git-read-tree -u -
v -
m $head "$new_head" &&
finish "$new_head" "Fast forward"
dropsave
exit 0
finish "$new_head" "Fast forward"
dropsave
exit 0
@@
-142,9
+146,11
@@
case "$#,$common,$no_commit" in
1,*,)
# We are not doing octopus, not fast forward, and have only
# one common. See if it is really trivial.
1,*,)
# We are not doing octopus, not fast forward, and have only
# one common. See if it is really trivial.
+ git var GIT_COMMITTER_IDENT >/dev/null || exit
+
echo "Trying really trivial in-index merge..."
git-update-index --refresh 2>/dev/null
echo "Trying really trivial in-index merge..."
git-update-index --refresh 2>/dev/null
- if git-read-tree --trivial -m -u $common $head "$1" &&
+ if git-read-tree --trivial -m -u
-v
$common $head "$1" &&
result_tree=$(git-write-tree)
then
echo "Wonderful."
result_tree=$(git-write-tree)
then
echo "Wonderful."
@@
-179,6
+185,9
@@
case "$#,$common,$no_commit" in
;;
esac
;;
esac
+# We are going to make a new commit.
+git var GIT_COMMITTER_IDENT >/dev/null || exit
+
case "$use_strategies" in
'')
case "$#" in
case "$use_strategies" in
'')
case "$#" in
@@
-293,7
+302,7
@@
for remote
do
echo $remote
done >"$GIT_DIR/MERGE_HEAD"
do
echo $remote
done >"$GIT_DIR/MERGE_HEAD"
-echo
$merge_msg
>"$GIT_DIR/MERGE_MSG"
+echo
"$merge_msg"
>"$GIT_DIR/MERGE_MSG"
if test "$merge_was_ok" = t
then
if test "$merge_was_ok" = t
then
@@
-301,5
+310,17
@@
then
"Automatic merge went well; stopped before committing as requested"
exit 0
else
"Automatic merge went well; stopped before committing as requested"
exit 0
else
+ {
+ echo '
+Conflicts:
+'
+ git ls-files --unmerged |
+ sed -e 's/^[^ ]* / /' |
+ uniq
+ } >>"$GIT_DIR/MERGE_MSG"
+ if test -d "$GIT_DIR/rr-cache"
+ then
+ git-rerere
+ fi
die "Automatic merge failed; fix up by hand"
fi
die "Automatic merge failed; fix up by hand"
fi