3 # Copyright (c) 2005 Junio C Hamano
6 USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [--reflog-action=<action>] [-m=<merge-message>] <commit>+'
13 all_strategies='recur recursive octopus resolve stupid ours'
14 default_twohead_strategies='recursive'
15 default_octopus_strategies='octopus'
16 no_trivial_merge_strategies='ours'
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 -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
41 finish_up_to_date () {
44 echo "$1 (nothing to squash)" ;;
52 echo Squashed commit of the following:
54 git-log --no-merges ^"$head" $remote
67 echo "Squash commit -- not updating HEAD"
68 squash_message >"$GIT_DIR/SQUASH_MSG"
73 echo "No merge message -- not updating HEAD"
76 git-update-ref -m "$rlogm" HEAD "$1" "$head" || exit 1
87 git-diff-tree --stat --summary -M "$head" "$1"
96 rh=$(git-rev-parse --verify "$remote^0" 2>/dev/null) || return
97 bh=$(git-show-ref -s --verify "refs/heads/$remote" 2>/dev/null)
100 echo "$rh branch '$remote' of ."
101 elif truname=$(expr "$remote" : '\(.*\)~[1-9][0-9]*$') &&
102 git-show-ref -q --verify "refs/heads/$truname" 2>/dev/null
104 echo "$rh branch '$truname' (early part) of ."
106 echo "$rh commit '$remote'"
110 case "$#" in 0) usage ;; esac
113 while case "$#" in 0) break ;; esac
116 -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
117 --no-summa|--no-summar|--no-summary)
119 --sq|--squ|--squa|--squas|--squash)
120 squash=t no_commit=t ;;
121 --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
123 -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
124 --strateg=*|--strategy=*|\
125 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
128 strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
135 case " $all_strategies " in
137 use_strategies="$use_strategies$strategy " ;;
139 die "available strategies are: $all_strategies" ;;
143 rloga=`expr "z$1" : 'z-[^=]*=\(.*\)'`
145 -m=*|--m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
146 merge_msg=`expr "z$1" : 'z-[^=]*=\(.*\)'`
149 -m|--m|--me|--mes|--mess|--messa|--messag|--message)
163 # This could be traditional "merge <msg> HEAD <commit>..." and the
164 # way we can tell it is to see if the second token is HEAD, but some
165 # people might have misused the interface and used a committish that
166 # is the same as HEAD there instead. Traditional format never would
167 # have "-m" so it is an additional safety measure to check for it.
169 if test -z "$have_message" &&
170 second_token=$(git-rev-parse --verify "$2^0" 2>/dev/null) &&
171 head_commit=$(git-rev-parse --verify "HEAD" 2>/dev/null) &&
172 test "$second_token" = "$head_commit"
178 elif ! git-rev-parse --verify HEAD >/dev/null 2>&1
180 # If the merged head is a valid one there is no reason to
181 # forbid "git merge" into a branch yet to be born. We do
182 # the same for "git pull".
185 echo >&2 "Can merge only exactly one commit into empty head"
189 rh=$(git rev-parse --verify "$1^0") ||
190 die "$1 - not something we can merge"
192 git-update-ref -m "initial pull" HEAD "$rh" "" &&
193 git-read-tree --reset -u HEAD
197 # We are invoked directly as the first-class UI.
200 # All the rest are the commits being merged; prepare
201 # the standard merge summary message to be appended to
202 # the given message. If remote is invalid we will die
203 # later in the common codepath so we discard the error
205 merge_name=$(for remote
208 done | git-fmt-merge-msg
210 merge_msg="${merge_msg:+$merge_msg$LF$LF}$merge_name"
212 head=$(git-rev-parse --verify "$head_arg"^0) || usage
214 # All the rest are remote heads
215 test "$#" = 0 && usage ;# we need at least one remote head.
216 test "$rloga" = '' && rloga="merge: $@"
221 remotehead=$(git-rev-parse --verify "$remote"^0 2>/dev/null) ||
222 die "$remote - not something we can merge"
223 remoteheads="${remoteheads}$remotehead "
225 set x $remoteheads ; shift
227 case "$use_strategies" in
231 use_strategies="$default_twohead_strategies" ;;
233 use_strategies="$default_octopus_strategies" ;;
238 for s in $use_strategies
241 *" $no_trivial_merge_strategies "*)
250 common=$(git-merge-base --all $head "$@")
253 common=$(git-show-branch --merge-base $head "$@")
256 echo "$head" >"$GIT_DIR/ORIG_HEAD"
258 case "$index_merge,$#,$common,$no_commit" in
260 # We've been told not to try anything clever. Skip to real merge.
263 # No common ancestors found. We need a real merge.
266 # If head can reach all the merge then we are up to date.
267 # but first the most common case of merging one remote.
268 finish_up_to_date "Already up-to-date."
272 # Again the most common case of merging one remote.
273 echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
274 git-update-index --refresh 2>/dev/null
275 new_head=$(git-rev-parse --verify "$1^0") &&
276 git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
277 finish "$new_head" "Fast forward"
282 # We are not doing octopus and not fast forward. Need a
286 # We are not doing octopus, not fast forward, and have only
287 # one common. See if it is really trivial.
288 git var GIT_COMMITTER_IDENT >/dev/null || exit
290 echo "Trying really trivial in-index merge..."
291 git-update-index --refresh 2>/dev/null
292 if git-read-tree --trivial -m -u -v $common $head "$1" &&
293 result_tree=$(git-write-tree)
298 git-commit-tree $result_tree -p HEAD -p "$1"
300 finish "$result_commit" "In-index merge"
307 # An octopus. If we can reach all the remote we are up to date.
311 common_one=$(git-merge-base --all $head $remote)
312 if test "$common_one" != "$remote"
318 if test "$up_to_date" = t
320 finish_up_to_date "Already up-to-date. Yeeah!"
326 # We are going to make a new commit.
327 git var GIT_COMMITTER_IDENT >/dev/null || exit
329 # At this point, we need a real merge. No matter what strategy
330 # we use, it would operate on the index, possibly affecting the
331 # working tree, and when resolved cleanly, have the desired tree
332 # in the index -- this means that the index must be in sync with
333 # the $head commit. The strategies are responsible to ensure this.
335 case "$use_strategies" in
337 # Stash away the local changes so that we can try more than one.
342 rm -f "$GIT_DIR/MERGE_SAVE"
347 result_tree= best_cnt=-1 best_strategy= wt_strategy=
349 for strategy in $use_strategies
351 test "$wt_strategy" = '' || {
352 echo "Rewinding the tree to pristine..."
355 case "$single_strategy" in
357 echo "Trying merge strategy $strategy..."
361 # Remember which strategy left the state in the working tree
362 wt_strategy=$strategy
364 git-merge-$strategy $common -- "$head_arg" "$@"
366 if test "$no_commit" = t && test "$exit" = 0
369 exit=1 ;# pretend it left conflicts.
372 test "$exit" = 0 || {
374 # The backend exits with 1 when conflicts are left to be resolved,
375 # with 2 when it does not handle the given merge at all.
377 if test "$exit" -eq 1
380 git-diff-files --name-only
381 git-ls-files --unmerged
383 if test $best_cnt -le 0 -o $cnt -le $best_cnt
385 best_strategy=$strategy
392 # Automerge succeeded.
393 result_tree=$(git-write-tree) && break
396 # If we have a resulting tree, that means the strategy module
397 # auto resolved the merge cleanly.
398 if test '' != "$result_tree"
400 parents=$(git-show-branch --independent "$head" "$@" | sed -e 's/^/-p /')
401 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents) || exit
402 finish "$result_commit" "Merge made by $wt_strategy."
407 # Pick the result from the best strategy and have the user fix it up.
408 case "$best_strategy" in
411 case "$use_strategies" in
413 echo >&2 "No merge strategy handled the merge."
416 echo >&2 "Merge with strategy $use_strategies failed."
422 # We already have its result in the working tree.
425 echo "Rewinding the tree to pristine..."
427 echo "Using the $best_strategy to prepare resolving by hand."
428 git-merge-$best_strategy $common -- "$head_arg" "$@"
432 if test "$squash" = t
439 done >"$GIT_DIR/MERGE_HEAD"
440 echo "$merge_msg" >"$GIT_DIR/MERGE_MSG"
443 if test "$merge_was_ok" = t
446 "Automatic merge went well; stopped before committing as requested"
453 git ls-files --unmerged |
454 sed -e 's/^[^ ]* / /' |
456 } >>"$GIT_DIR/MERGE_MSG"
457 if test -d "$GIT_DIR/rr-cache"
461 die "Automatic merge failed; fix conflicts and then commit the result."