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" \
23 "$GIT_DIR/MERGE_SAVE" || exit 1
27 git diff -r -z --name-only $head | cpio -0 -o >"$GIR_DIR/MERGE_SAVE"
31 git reset --hard $head
32 cpio -iuv <"$GIT_DIR/MERGE_SAVE"
33 git-update-index --refresh >/dev/null
39 git-diff-tree -p -M $head "$1" |
40 git-apply --stat --summary
45 while case "$#" in 0) break ;; esac
48 -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
49 --no-summa|--no-summar|--no-summary)
51 -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
52 --strateg=*|--strategy=*|\
53 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
56 strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
63 case " $all_strategies " in
65 use_strategies="$use_strategies$strategy " ;;
67 die "available strategies are: $all_strategies" ;;
76 case "$use_strategies" in
78 use_strategies=$default_strategies
81 test "$#" -le 2 && usage ;# we need at least two heads.
86 head=$(git-rev-parse --verify "$1"^0) || usage
89 # All the rest are remote heads
92 git-rev-parse --verify "$remote"^0 >/dev/null ||
93 die "$remote - not something we can merge"
96 common=$(git-show-branch --merge-base $head "$@")
97 echo "$head" >"$GIT_DIR/ORIG_HEAD"
101 die "Unable to find common commit between $head_arg and $*"
104 # If head can reach all the merge then we are up to date.
105 # but first the most common case of merging one remote
106 echo "Already up-to-date. Yeeah!"
111 # Again the most common case of merging one remote.
112 echo "Updating from $head to $1."
113 git-update-index --refresh 2>/dev/null
114 git-read-tree -u -m $head "$1" || exit 1
115 git-rev-parse --verify "$1^0" > "$GIT_DIR/HEAD"
121 # We are not doing octopus and not fast forward. Need a
125 # An octopus. If we can reach all the remote we are up to date.
129 common_one=$(git-merge-base $head $remote)
130 if test "$common_one" != "$remote"
136 if test "$up_to_date" = t
138 echo "Already up-to-date. Yeeah!"
145 # At this point, we need a real merge. No matter what strategy
146 # we use, it would operate on the index, possibly affecting the
147 # working tree, and when resolved cleanly, have the desired tree
148 # in the index -- this means that the index must be in sync with
150 files=$(git-diff-index --cached --name-only $head) || exit
151 if [ "$files" ]; then
152 echo >&2 "Dirty index: cannot merge (dirty: $files)"
156 case "$use_strategies" in
158 # Stash away the local changes so that we can try more than one.
167 result_tree= best_cnt=-1 best_strategy= wt_strategy=
168 for strategy in $use_strategies
170 test "$wt_strategy" = '' || {
171 echo "Rewinding the tree to pristine..."
174 case "$single_strategy" in
176 echo "Trying merge strategy $strategy..."
180 # Remember which strategy left the state in the working tree
181 wt_strategy=$strategy
183 git-merge-$strategy $common -- "$head_arg" "$@" || {
185 # The backend exits with 1 when conflicts are left to be resolved,
186 # with 2 when it does not handle the given merge at all.
189 if test "$exit" -eq 1
192 git-diff-files --name-only
193 git-ls-files --unmerged
195 if test $best_cnt -le 0 -o $cnt -le $best_cnt
197 best_strategy=$strategy
204 # Automerge succeeded.
205 result_tree=$(git-write-tree) && break
208 # If we have a resulting tree, that means the strategy module
209 # auto resolved the merge cleanly.
210 if test '' != "$result_tree"
215 parents="$parents -p $remote"
217 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents)
218 echo "Committed merge $result_commit, made by $wt_strategy."
219 echo $result_commit >"$GIT_DIR/HEAD"
220 summary $result_commit
225 # Pick the result from the best strategy and have the user fix it up.
226 case "$best_strategy" in
229 die "No merge strategy handled the merge."
232 # We already have its result in the working tree.
235 echo "Rewinding the tree to pristine..."
237 echo "Using the $best_strategy to prepare resolving by hand."
238 git-merge-$best_strategy $common -- "$head_arg" "$@"
244 done >"$GIT_DIR/MERGE_HEAD"
245 die "Automatic merge failed; fix up by hand"