3 # Copyright (c) 2005 Junio C Hamano
6 USAGE='[-n] [--summary] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
13 test -z "$(git ls-files -u)" ||
14 die "You are in the middle of a conflicted merge."
19 all_strategies='recur recursive octopus resolve stupid ours subtree'
20 default_twohead_strategies='recursive'
21 default_octopus_strategies='octopus'
22 no_fast_forward_strategies='subtree ours'
23 no_trivial_strategies='recursive recur subtree ours'
30 rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
31 "$GIT_DIR/MERGE_STASH" || exit 1
35 # Stash away any local modifications.
36 git stash create >"$GIT_DIR/MERGE_STASH"
40 if test -f "$GIT_DIR/MERGE_STASH"
42 git reset --hard $head >/dev/null
43 git stash apply $(cat "$GIT_DIR/MERGE_STASH")
44 git update-index --refresh >/dev/null
48 finish_up_to_date () {
51 echo "$1 (nothing to squash)" ;;
59 echo Squashed commit of the following:
61 git log --no-merges ^"$head" $remote
67 rlogm="$GIT_REFLOG_ACTION"
70 rlogm="$GIT_REFLOG_ACTION: $2"
74 echo "Squash commit -- not updating HEAD"
75 squash_message >"$GIT_DIR/SQUASH_MSG"
80 echo "No merge message -- not updating HEAD"
83 git update-ref -m "$rlogm" HEAD "$1" "$head" || exit 1
92 if test "$show_diffstat" = t
94 # We want color (if set), but no pager
95 GIT_PAGER='' git diff --stat --summary -M "$head" "$1"
103 rh=$(git rev-parse --verify "$remote^0" 2>/dev/null) || return
104 bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null)
105 if test "$rh" = "$bh"
107 echo "$rh branch '$remote' of ."
108 elif truname=$(expr "$remote" : '\(.*\)~[1-9][0-9]*$') &&
109 git show-ref -q --verify "refs/heads/$truname" 2>/dev/null
111 echo "$rh branch '$truname' (early part) of ."
112 elif test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD"
114 sed -e 's/ not-for-merge / /' -e 1q \
115 "$GIT_DIR/FETCH_HEAD"
117 echo "$rh commit '$remote'"
121 case "$#" in 0) usage ;; esac
124 while case "$#" in 0) break ;; esac
127 -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
128 --no-summa|--no-summar|--no-summary)
129 show_diffstat=false ;;
132 --sq|--squ|--squa|--squas|--squash)
133 squash=t no_commit=t ;;
134 --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
136 -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
137 --strateg=*|--strategy=*|\
138 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
141 strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
148 case " $all_strategies " in
150 use_strategies="$use_strategies$strategy " ;;
152 die "available strategies are: $all_strategies" ;;
155 -m=*|--m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
156 merge_msg=`expr "z$1" : 'z-[^=]*=\(.*\)'`
159 -m|--m|--me|--mes|--mess|--messa|--messag|--message)
173 if test -z "$show_diffstat"; then
174 test "$(git config --bool merge.diffstat)" = false && show_diffstat=false
175 test -z "$show_diffstat" && show_diffstat=t
178 # This could be traditional "merge <msg> HEAD <commit>..." and the
179 # way we can tell it is to see if the second token is HEAD, but some
180 # people might have misused the interface and used a committish that
181 # is the same as HEAD there instead. Traditional format never would
182 # have "-m" so it is an additional safety measure to check for it.
184 if test -z "$have_message" &&
185 second_token=$(git rev-parse --verify "$2^0" 2>/dev/null) &&
186 head_commit=$(git rev-parse --verify "HEAD" 2>/dev/null) &&
187 test "$second_token" = "$head_commit"
193 elif ! git rev-parse --verify HEAD >/dev/null 2>&1
195 # If the merged head is a valid one there is no reason to
196 # forbid "git merge" into a branch yet to be born. We do
197 # the same for "git pull".
200 echo >&2 "Can merge only exactly one commit into empty head"
204 rh=$(git rev-parse --verify "$1^0") ||
205 die "$1 - not something we can merge"
207 git update-ref -m "initial pull" HEAD "$rh" "" &&
208 git read-tree --reset -u HEAD
212 # We are invoked directly as the first-class UI.
215 # All the rest are the commits being merged; prepare
216 # the standard merge summary message to be appended to
217 # the given message. If remote is invalid we will die
218 # later in the common codepath so we discard the error
220 merge_name=$(for remote
223 done | git fmt-merge-msg
225 merge_msg="${merge_msg:+$merge_msg$LF$LF}$merge_name"
227 head=$(git rev-parse --verify "$head_arg"^0) || usage
229 # All the rest are remote heads
230 test "$#" = 0 && usage ;# we need at least one remote head.
231 set_reflog_action "merge $*"
236 remotehead=$(git rev-parse --verify "$remote"^0 2>/dev/null) ||
237 die "$remote - not something we can merge"
238 remoteheads="${remoteheads}$remotehead "
239 eval GITHEAD_$remotehead='"$remote"'
240 export GITHEAD_$remotehead
242 set x $remoteheads ; shift
244 case "$use_strategies" in
248 var="`git config --get pull.twohead`"
251 use_strategies="$var"
253 use_strategies="$default_twohead_strategies"
256 var="`git config --get pull.octopus`"
259 use_strategies="$var"
261 use_strategies="$default_octopus_strategies"
267 for s in $use_strategies
269 for ss in $no_fast_forward_strategies
278 for ss in $no_trivial_strategies
282 allow_trivial_merge=f
291 common=$(git merge-base --all $head "$@")
294 common=$(git show-branch --merge-base $head "$@")
297 echo "$head" >"$GIT_DIR/ORIG_HEAD"
299 case "$allow_fast_forward,$#,$common,$no_commit" in
301 # No common ancestors found. We need a real merge.
304 # If head can reach all the merge then we are up to date.
305 # but first the most common case of merging one remote.
306 finish_up_to_date "Already up-to-date."
310 # Again the most common case of merging one remote.
311 echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $1)"
312 git update-index --refresh 2>/dev/null
314 if test -n "$have_message"
316 msg="$msg (no commit created; -m option ignored)"
318 new_head=$(git rev-parse --verify "$1^0") &&
319 git read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
320 finish "$new_head" "$msg" || exit
325 # We are not doing octopus and not fast forward. Need a
329 # We are not doing octopus, not fast forward, and have only
331 git update-index --refresh 2>/dev/null
332 case "$allow_trivial_merge" in
334 # See if it is really trivial.
335 git var GIT_COMMITTER_IDENT >/dev/null || exit
336 echo "Trying really trivial in-index merge..."
337 if git read-tree --trivial -m -u -v $common $head "$1" &&
338 result_tree=$(git write-tree)
342 printf '%s\n' "$merge_msg" |
343 git commit-tree $result_tree -p HEAD -p "$1"
345 finish "$result_commit" "In-index merge"
353 # An octopus. If we can reach all the remote we are up to date.
357 common_one=$(git merge-base --all $head $remote)
358 if test "$common_one" != "$remote"
364 if test "$up_to_date" = t
366 finish_up_to_date "Already up-to-date. Yeeah!"
372 # We are going to make a new commit.
373 git var GIT_COMMITTER_IDENT >/dev/null || exit
375 # At this point, we need a real merge. No matter what strategy
376 # we use, it would operate on the index, possibly affecting the
377 # working tree, and when resolved cleanly, have the desired tree
378 # in the index -- this means that the index must be in sync with
379 # the $head commit. The strategies are responsible to ensure this.
381 case "$use_strategies" in
383 # Stash away the local changes so that we can try more than one.
388 rm -f "$GIT_DIR/MERGE_STASH"
393 result_tree= best_cnt=-1 best_strategy= wt_strategy=
395 for strategy in $use_strategies
397 test "$wt_strategy" = '' || {
398 echo "Rewinding the tree to pristine..."
401 case "$single_strategy" in
403 echo "Trying merge strategy $strategy..."
407 # Remember which strategy left the state in the working tree
408 wt_strategy=$strategy
410 git-merge-$strategy $common -- "$head_arg" "$@"
412 if test "$no_commit" = t && test "$exit" = 0
415 exit=1 ;# pretend it left conflicts.
418 test "$exit" = 0 || {
420 # The backend exits with 1 when conflicts are left to be resolved,
421 # with 2 when it does not handle the given merge at all.
423 if test "$exit" -eq 1
426 git diff-files --name-only
427 git ls-files --unmerged
429 if test $best_cnt -le 0 -o $cnt -le $best_cnt
431 best_strategy=$strategy
438 # Automerge succeeded.
439 result_tree=$(git write-tree) && break
442 # If we have a resulting tree, that means the strategy module
443 # auto resolved the merge cleanly.
444 if test '' != "$result_tree"
446 parents=$(git show-branch --independent "$head" "$@" | sed -e 's/^/-p /')
447 result_commit=$(printf '%s\n' "$merge_msg" | git commit-tree $result_tree $parents) || exit
448 finish "$result_commit" "Merge made by $wt_strategy."
453 # Pick the result from the best strategy and have the user fix it up.
454 case "$best_strategy" in
457 case "$use_strategies" in
459 echo >&2 "No merge strategy handled the merge."
462 echo >&2 "Merge with strategy $use_strategies failed."
468 # We already have its result in the working tree.
471 echo "Rewinding the tree to pristine..."
473 echo "Using the $best_strategy to prepare resolving by hand."
474 git-merge-$best_strategy $common -- "$head_arg" "$@"
478 if test "$squash" = t
485 done >"$GIT_DIR/MERGE_HEAD"
486 printf '%s\n' "$merge_msg" >"$GIT_DIR/MERGE_MSG"
489 if test "$merge_was_ok" = t
492 "Automatic merge went well; stopped before committing as requested"
499 git ls-files --unmerged |
500 sed -e 's/^[^ ]* / /' |
502 } >>"$GIT_DIR/MERGE_MSG"
504 die "Automatic merge failed; fix conflicts and then commit the result."