diff options
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/git-merge.sh b/git-merge.sh index 477002910..1c4f6693f 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -298,24 +298,30 @@ f,*) ;; ?,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..." + # one common. git-update-index --refresh 2>/dev/null - if git-read-tree --trivial -m -u -v $common $head "$1" && - result_tree=$(git-write-tree) - then - echo "Wonderful." - result_commit=$( - echo "$merge_msg" | - git-commit-tree $result_tree -p HEAD -p "$1" - ) || exit - finish "$result_commit" "In-index merge" - dropsave - exit 0 - fi - echo "Nope." + case " $use_strategies " in + *' recursive '*|*' recur '*) + : run merge later + ;; + *) + # See if it is really trivial. + git var GIT_COMMITTER_IDENT >/dev/null || exit + echo "Trying really trivial in-index merge..." + if git-read-tree --trivial -m -u -v $common $head "$1" && + result_tree=$(git-write-tree) + then + echo "Wonderful." + result_commit=$( + echo "$merge_msg" | + git-commit-tree $result_tree -p HEAD -p "$1" + ) || exit + finish "$result_commit" "In-index merge" + dropsave + exit 0 + fi + echo "Nope." + esac ;; *) # An octopus. If we can reach all the remote we are up to date. |