3 # Copyright (c) 2005 Junio C Hamano
6 . git-sh-setup || die "Not a git archive"
12 die "git-merge [-n] [-s <strategy>]... <merge-message> <head> <remote>+"
15 # all_strategies='resolve recursive stupid octopus'
17 all_strategies='recursive octopus resolve stupid'
18 default_strategies='resolve octopus'
22 rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
23 "$GIT_DIR/MERGE_SAVE" || exit 1
27 # Stash away any local modifications.
28 git-diff-index -r -z --name-only $head |
29 cpio -0 -o >"$GIT_DIR/MERGE_SAVE"
33 if test -f "$GIT_DIR/MERGE_SAVE"
35 git reset --hard $head
36 cpio -iuv <"$GIT_DIR/MERGE_SAVE"
37 git-update-index --refresh >/dev/null
44 git-diff-tree -p -M $head "$1" |
45 git-apply --stat --summary
50 while case "$#" in 0) break ;; esac
53 -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
54 --no-summa|--no-summar|--no-summary)
56 -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
57 --strateg=*|--strategy=*|\
58 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
61 strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
68 case " $all_strategies " in
70 use_strategies="$use_strategies$strategy " ;;
72 die "available strategies are: $all_strategies" ;;
81 case "$use_strategies" in
83 use_strategies=$default_strategies
86 test "$#" -le 2 && usage ;# we need at least two heads.
91 head=$(git-rev-parse --verify "$1"^0) || usage
94 # All the rest are remote heads
97 git-rev-parse --verify "$remote"^0 >/dev/null ||
98 die "$remote - not something we can merge"
101 common=$(git-show-branch --merge-base $head "$@")
102 echo "$head" >"$GIT_DIR/ORIG_HEAD"
106 # No common ancestors found. We need a real merge.
109 # If head can reach all the merge then we are up to date.
110 # but first the most common case of merging one remote
111 echo "Already up-to-date. Yeeah!"
116 # Again the most common case of merging one remote.
117 echo "Updating from $head to $1."
118 git-update-index --refresh 2>/dev/null
119 git-read-tree -u -m $head "$1" &&
120 new_head=$(git-rev-parse --verify "$1^0") &&
121 git-update-ref HEAD "$new_head" "$head" || exit 1
127 # We are not doing octopus and not fast forward. Need a
131 # We are not doing octopus, not fast forward, and have only
132 # one common. See if it is really trivial.
133 echo "Trying really trivial in-index merge..."
134 git-update-index --refresh 2>/dev/null
135 if git-read-tree --trivial -m -u $common $head "$1" &&
136 result_tree=$(git-write-tree)
141 git-commit-tree $result_tree -p HEAD -p "$1"
143 git-update-ref HEAD $result_commit $head
144 summary $result_commit
151 # An octopus. If we can reach all the remote we are up to date.
155 common_one=$(git-merge-base $head $remote)
156 if test "$common_one" != "$remote"
162 if test "$up_to_date" = t
164 echo "Already up-to-date. Yeeah!"
171 # At this point, we need a real merge. No matter what strategy
172 # we use, it would operate on the index, possibly affecting the
173 # working tree, and when resolved cleanly, have the desired tree
174 # in the index -- this means that the index must be in sync with
175 # the $head commit. The strategies are responsible to ensure this.
177 case "$use_strategies" in
179 # Stash away the local changes so that we can try more than one.
184 rm -f "$GIT_DIR/MERGE_SAVE"
189 result_tree= best_cnt=-1 best_strategy= wt_strategy=
190 for strategy in $use_strategies
192 test "$wt_strategy" = '' || {
193 echo "Rewinding the tree to pristine..."
196 case "$single_strategy" in
198 echo "Trying merge strategy $strategy..."
202 # Remember which strategy left the state in the working tree
203 wt_strategy=$strategy
205 git-merge-$strategy $common -- "$head_arg" "$@" || {
207 # The backend exits with 1 when conflicts are left to be resolved,
208 # with 2 when it does not handle the given merge at all.
211 if test "$exit" -eq 1
214 git-diff-files --name-only
215 git-ls-files --unmerged
217 if test $best_cnt -le 0 -o $cnt -le $best_cnt
219 best_strategy=$strategy
226 # Automerge succeeded.
227 result_tree=$(git-write-tree) && break
230 # If we have a resulting tree, that means the strategy module
231 # auto resolved the merge cleanly.
232 if test '' != "$result_tree"
237 parents="$parents -p $remote"
239 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents) || exit
240 echo "Committed merge $result_commit, made by $wt_strategy."
241 git-update-ref HEAD $result_commit $head
242 summary $result_commit
247 # Pick the result from the best strategy and have the user fix it up.
248 case "$best_strategy" in
251 die "No merge strategy handled the merge."
254 # We already have its result in the working tree.
257 echo "Rewinding the tree to pristine..."
259 echo "Using the $best_strategy to prepare resolving by hand."
260 git-merge-$best_strategy $common -- "$head_arg" "$@"
266 done >"$GIT_DIR/MERGE_HEAD"
267 echo $merge_msg >"$GIT_DIR/MERGE_MSG"
269 die "Automatic merge failed; fix up by hand"