3 # Copyright (c) 2005 Junio C Hamano
7 USAGE='[-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+'
13 all_strategies='recursive octopus resolve stupid ours'
14 default_strategies='recursive'
18 rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
19 "$GIT_DIR/MERGE_SAVE" || exit 1
23 # Stash away any local modifications.
24 git-diff-index -z --name-only $head |
25 cpio -0 -o >"$GIT_DIR/MERGE_SAVE"
29 if test -f "$GIT_DIR/MERGE_SAVE"
31 git reset --hard $head
32 cpio -iuv <"$GIT_DIR/MERGE_SAVE"
33 git-update-index --refresh >/dev/null
38 test '' = "$2" || echo "$2"
41 echo "No merge message -- not updating HEAD"
44 git-update-ref HEAD "$1" "$head" || exit 1
50 git-diff-tree -p -M "$head" "$1" |
51 git-apply --stat --summary
56 while case "$#" in 0) break ;; esac
59 -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
60 --no-summa|--no-summar|--no-summary)
62 --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
64 -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
65 --strateg=*|--strategy=*|\
66 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
69 strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
76 case " $all_strategies " in
78 use_strategies="$use_strategies$strategy " ;;
80 die "available strategies are: $all_strategies" ;;
89 test "$#" -le 2 && usage ;# we need at least two heads.
94 head=$(git-rev-parse --verify "$1"^0) || usage
97 # All the rest are remote heads
101 remotehead=$(git-rev-parse --verify "$remote"^0) ||
102 die "$remote - not something we can merge"
103 remoteheads="${remoteheads}$remotehead "
105 set x $remoteheads ; shift
109 common=$(git-merge-base --all $head "$@")
112 common=$(git-show-branch --merge-base $head "$@")
115 echo "$head" >"$GIT_DIR/ORIG_HEAD"
117 case "$#,$common,$no_commit" in
119 # No common ancestors found. We need a real merge.
122 # If head can reach all the merge then we are up to date.
123 # but first the most common case of merging one remote
124 echo "Already up-to-date."
129 # Again the most common case of merging one remote.
130 echo "Updating from $head to $1."
131 git-update-index --refresh 2>/dev/null
132 new_head=$(git-rev-parse --verify "$1^0") &&
133 git-read-tree -u -m $head "$new_head" &&
134 finish "$new_head" "Fast forward"
139 # We are not doing octopus and not fast forward. Need a
143 # We are not doing octopus, not fast forward, and have only
144 # one common. See if it is really trivial.
145 echo "Trying really trivial in-index merge..."
146 git-update-index --refresh 2>/dev/null
147 if git-read-tree --trivial -m -u $common $head "$1" &&
148 result_tree=$(git-write-tree)
153 git-commit-tree $result_tree -p HEAD -p "$1"
155 finish "$result_commit" "In-index merge"
162 # An octopus. If we can reach all the remote we are up to date.
166 common_one=$(git-merge-base --all $head $remote)
167 if test "$common_one" != "$remote"
173 if test "$up_to_date" = t
175 echo "Already up-to-date. Yeeah!"
182 case "$use_strategies" in
186 use_strategies="$default_strategies" ;;
188 use_strategies=octopus ;;
193 # At this point, we need a real merge. No matter what strategy
194 # we use, it would operate on the index, possibly affecting the
195 # working tree, and when resolved cleanly, have the desired tree
196 # in the index -- this means that the index must be in sync with
197 # the $head commit. The strategies are responsible to ensure this.
199 case "$use_strategies" in
201 # Stash away the local changes so that we can try more than one.
206 rm -f "$GIT_DIR/MERGE_SAVE"
211 result_tree= best_cnt=-1 best_strategy= wt_strategy=
213 for strategy in $use_strategies
215 test "$wt_strategy" = '' || {
216 echo "Rewinding the tree to pristine..."
219 case "$single_strategy" in
221 echo "Trying merge strategy $strategy..."
225 # Remember which strategy left the state in the working tree
226 wt_strategy=$strategy
228 git-merge-$strategy $common -- "$head_arg" "$@"
230 if test "$no_commit" = t && test "$exit" = 0
233 exit=1 ;# pretend it left conflicts.
236 test "$exit" = 0 || {
238 # The backend exits with 1 when conflicts are left to be resolved,
239 # with 2 when it does not handle the given merge at all.
241 if test "$exit" -eq 1
244 git-diff-files --name-only
245 git-ls-files --unmerged
247 if test $best_cnt -le 0 -o $cnt -le $best_cnt
249 best_strategy=$strategy
256 # Automerge succeeded.
257 result_tree=$(git-write-tree) && break
260 # If we have a resulting tree, that means the strategy module
261 # auto resolved the merge cleanly.
262 if test '' != "$result_tree"
267 parents="$parents -p $remote"
269 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents) || exit
270 finish "$result_commit" "Merge $result_commit, made by $wt_strategy."
275 # Pick the result from the best strategy and have the user fix it up.
276 case "$best_strategy" in
279 echo >&2 "No merge strategy handled the merge."
283 # We already have its result in the working tree.
286 echo "Rewinding the tree to pristine..."
288 echo "Using the $best_strategy to prepare resolving by hand."
289 git-merge-$best_strategy $common -- "$head_arg" "$@"
295 done >"$GIT_DIR/MERGE_HEAD"
296 echo $merge_msg >"$GIT_DIR/MERGE_MSG"
298 if test "$merge_was_ok" = t
301 "Automatic merge went well; stopped before committing as requested"
304 die "Automatic merge failed; fix up by hand"