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" || exit 1
28 git-diff-tree -p -M $head "$1" |
29 git-apply --stat --summary
34 while case "$#" in 0) break ;; esac
37 -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
38 --no-summa|--no-summar|--no-summary)
40 -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
41 --strateg=*|--strategy=*|\
42 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
45 strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
52 case " $all_strategies " in
54 use_strategies="$use_strategies$strategy " ;;
56 die "available strategies are: $all_strategies" ;;
65 case "$use_strategies" in
67 use_strategies=$default_strategies
70 test "$#" -le 2 && usage ;# we need at least two heads.
75 head=$(git-rev-parse --verify "$1"^0) || usage
78 # All the rest are remote heads
81 git-rev-parse --verify "$remote"^0 >/dev/null ||
82 die "$remote - not something we can merge"
85 common=$(git-show-branch --merge-base $head "$@")
86 echo "$head" >"$GIT_DIR/ORIG_HEAD"
90 die "Unable to find common commit between $head_arg and $*"
93 # If head can reach all the merge then we are up to date.
94 # but first the most common case of merging one remote
95 echo "Already up-to-date. Yeeah!"
100 # Again the most common case of merging one remote.
101 echo "Updating from $head to $1."
102 git-update-index --refresh 2>/dev/null
103 git-read-tree -u -m $head "$1" || exit 1
104 git-rev-parse --verify "$1^0" > "$GIT_DIR/HEAD"
110 # We are not doing octopus and not fast forward. Need a
114 # An octopus. If we can reach all the remote we are up to date.
118 common_one=$(git-merge-base $head $remote)
119 if test "$common_one" != "$remote"
125 if test "$up_to_date" = t
127 echo "Already up-to-date. Yeeah!"
134 # At this point we need a real merge. Require that the tree matches
137 git-update-index --refresh &&
138 test '' = "`git-diff-index --cached --name-only $head`" || {
139 die "Need real merge but the working tree has local changes."
142 result_tree= best_cnt=-1 best_strategy= wt_strategy=
143 for strategy in $use_strategies
145 test "$wt_strategy" = '' || {
146 echo "Rewinding the tree to pristine..."
147 git reset --hard $head
149 echo "Trying merge strategy $strategy..."
150 wt_strategy=$strategy
151 git-merge-$strategy $common -- $head_arg "$@" || {
153 # The backend exits with 1 when conflicts are left to be resolved,
154 # with 2 when it does not handle the given merge at all.
157 if test "$exit" -eq 1
160 git-diff-files --name-only
161 git-ls-files --unmerged
163 if test $best_cnt -le 0 -o $cnt -le $best_cnt
165 best_strategy=$strategy
172 # Automerge succeeded.
173 result_tree=$(git-write-tree) && break
176 # If we have a resulting tree, that means the strategy module
177 # auto resolved the merge cleanly.
178 if test '' != "$result_tree"
183 parents="$parents -p $remote"
185 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents)
186 echo "Committed merge $result_commit, made by $wt_strategy."
187 echo $result_commit >"$GIT_DIR/HEAD"
188 summary $result_commit
193 # Pick the result from the best strategy and have the user fix it up.
194 case "$best_strategy" in
196 git reset --hard $head
197 die "No merge strategy handled the merge."
200 # We already have its result in the working tree.
203 echo "Rewinding the tree to pristine..."
204 git reset --hard $head
205 echo "Using the $best_strategy to prepare resolving by hand."
206 git-merge-$best_strategy $common -- $head_arg "$@"
212 done >"$GIT_DIR/MERGE_HEAD"
213 die "Automatic merge failed; fix up by hand"