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_SAVE" || exit 1
35 # Stash away any local modifications.
36 git diff-index -z --name-only $head |
37 cpio -0 -o >"$GIT_DIR/MERGE_SAVE"
41 if test -f "$GIT_DIR/MERGE_SAVE"
43 git reset --hard $head >/dev/null
44 cpio -iuv <"$GIT_DIR/MERGE_SAVE"
45 git update-index --refresh >/dev/null
49 finish_up_to_date () {
52 echo "$1 (nothing to squash)" ;;
60 echo Squashed commit of the following:
62 git log --no-merges ^"$head" $remote
68 rlogm="$GIT_REFLOG_ACTION"
71 rlogm="$GIT_REFLOG_ACTION: $2"
75 echo "Squash commit -- not updating HEAD"
76 squash_message >"$GIT_DIR/SQUASH_MSG"
81 echo "No merge message -- not updating HEAD"
84 git update-ref -m "$rlogm" HEAD "$1" "$head" || exit 1
94 if test "$show_diffstat" = t
96 # We want color (if set), but no pager
97 GIT_PAGER='' git diff --stat --summary -M "$head" "$1"
105 rh=$(git rev-parse --verify "$remote^0" 2>/dev/null) || return
106 bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null)
107 if test "$rh" = "$bh"
109 echo "$rh branch '$remote' of ."
110 elif truname=$(expr "$remote" : '\(.*\)~[1-9][0-9]*$') &&
111 git show-ref -q --verify "refs/heads/$truname" 2>/dev/null
113 echo "$rh branch '$truname' (early part) of ."
114 elif test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD"
116 sed -e 's/ not-for-merge / /' -e 1q \
117 "$GIT_DIR/FETCH_HEAD"
119 echo "$rh commit '$remote'"
123 case "$#" in 0) usage ;; esac
126 while case "$#" in 0) break ;; esac
129 -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
130 --no-summa|--no-summar|--no-summary)
131 show_diffstat=false ;;
134 --sq|--squ|--squa|--squas|--squash)
135 squash=t no_commit=t ;;
136 --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
138 -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
139 --strateg=*|--strategy=*|\
140 -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
143 strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
150 case " $all_strategies " in
152 use_strategies="$use_strategies$strategy " ;;
154 die "available strategies are: $all_strategies" ;;
157 -m=*|--m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
158 merge_msg=`expr "z$1" : 'z-[^=]*=\(.*\)'`
161 -m|--m|--me|--mes|--mess|--messa|--messag|--message)
175 if test -z "$show_diffstat"; then
176 test "$(git config --bool merge.diffstat)" = false && show_diffstat=false
177 test -z "$show_diffstat" && show_diffstat=t
180 # This could be traditional "merge <msg> HEAD <commit>..." and the
181 # way we can tell it is to see if the second token is HEAD, but some
182 # people might have misused the interface and used a committish that
183 # is the same as HEAD there instead. Traditional format never would
184 # have "-m" so it is an additional safety measure to check for it.
186 if test -z "$have_message" &&
187 second_token=$(git rev-parse --verify "$2^0" 2>/dev/null) &&
188 head_commit=$(git rev-parse --verify "HEAD" 2>/dev/null) &&
189 test "$second_token" = "$head_commit"
195 elif ! git rev-parse --verify HEAD >/dev/null 2>&1
197 # If the merged head is a valid one there is no reason to
198 # forbid "git merge" into a branch yet to be born. We do
199 # the same for "git pull".
202 echo >&2 "Can merge only exactly one commit into empty head"
206 rh=$(git rev-parse --verify "$1^0") ||
207 die "$1 - not something we can merge"
209 git update-ref -m "initial pull" HEAD "$rh" "" &&
210 git read-tree --reset -u HEAD
214 # We are invoked directly as the first-class UI.
217 # All the rest are the commits being merged; prepare
218 # the standard merge summary message to be appended to
219 # the given message. If remote is invalid we will die
220 # later in the common codepath so we discard the error
222 merge_name=$(for remote
225 done | git fmt-merge-msg
227 merge_msg="${merge_msg:+$merge_msg$LF$LF}$merge_name"
229 head=$(git rev-parse --verify "$head_arg"^0) || usage
231 # All the rest are remote heads
232 test "$#" = 0 && usage ;# we need at least one remote head.
233 set_reflog_action "merge $*"
238 remotehead=$(git rev-parse --verify "$remote"^0 2>/dev/null) ||
239 die "$remote - not something we can merge"
240 remoteheads="${remoteheads}$remotehead "
241 eval GITHEAD_$remotehead='"$remote"'
242 export GITHEAD_$remotehead
244 set x $remoteheads ; shift
246 case "$use_strategies" in
250 var="`git config --get pull.twohead`"
253 use_strategies="$var"
255 use_strategies="$default_twohead_strategies"
258 var="`git config --get pull.octopus`"
261 use_strategies="$var"
263 use_strategies="$default_octopus_strategies"
269 for s in $use_strategies
271 for ss in $no_fast_forward_strategies
280 for ss in $no_trivial_strategies
284 allow_trivial_merge=f
293 common=$(git merge-base --all $head "$@")
296 common=$(git show-branch --merge-base $head "$@")
299 echo "$head" >"$GIT_DIR/ORIG_HEAD"
301 case "$allow_fast_forward,$#,$common,$no_commit" in
303 # No common ancestors found. We need a real merge.
306 # If head can reach all the merge then we are up to date.
307 # but first the most common case of merging one remote.
308 finish_up_to_date "Already up-to-date."
312 # Again the most common case of merging one remote.
313 echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $1)"
314 git update-index --refresh 2>/dev/null
316 if test -n "$have_message"
318 msg="$msg (no commit created; -m option ignored)"
320 new_head=$(git rev-parse --verify "$1^0") &&
321 git read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
322 finish "$new_head" "$msg" || exit
327 # We are not doing octopus and not fast forward. Need a
331 # We are not doing octopus, not fast forward, and have only
333 git update-index --refresh 2>/dev/null
334 case "$allow_trivial_merge" in
336 # See if it is really trivial.
337 git var GIT_COMMITTER_IDENT >/dev/null || exit
338 echo "Trying really trivial in-index merge..."
339 if git read-tree --trivial -m -u -v $common $head "$1" &&
340 result_tree=$(git write-tree)
344 printf '%s\n' "$merge_msg" |
345 git commit-tree $result_tree -p HEAD -p "$1"
347 finish "$result_commit" "In-index merge"
355 # An octopus. If we can reach all the remote we are up to date.
359 common_one=$(git merge-base --all $head $remote)
360 if test "$common_one" != "$remote"
366 if test "$up_to_date" = t
368 finish_up_to_date "Already up-to-date. Yeeah!"
374 # We are going to make a new commit.
375 git var GIT_COMMITTER_IDENT >/dev/null || exit
377 # At this point, we need a real merge. No matter what strategy
378 # we use, it would operate on the index, possibly affecting the
379 # working tree, and when resolved cleanly, have the desired tree
380 # in the index -- this means that the index must be in sync with
381 # the $head commit. The strategies are responsible to ensure this.
383 case "$use_strategies" in
385 # Stash away the local changes so that we can try more than one.
390 rm -f "$GIT_DIR/MERGE_SAVE"
395 result_tree= best_cnt=-1 best_strategy= wt_strategy=
397 for strategy in $use_strategies
399 test "$wt_strategy" = '' || {
400 echo "Rewinding the tree to pristine..."
403 case "$single_strategy" in
405 echo "Trying merge strategy $strategy..."
409 # Remember which strategy left the state in the working tree
410 wt_strategy=$strategy
412 git-merge-$strategy $common -- "$head_arg" "$@"
414 if test "$no_commit" = t && test "$exit" = 0
417 exit=1 ;# pretend it left conflicts.
420 test "$exit" = 0 || {
422 # The backend exits with 1 when conflicts are left to be resolved,
423 # with 2 when it does not handle the given merge at all.
425 if test "$exit" -eq 1
428 git diff-files --name-only
429 git ls-files --unmerged
431 if test $best_cnt -le 0 -o $cnt -le $best_cnt
433 best_strategy=$strategy
440 # Automerge succeeded.
441 result_tree=$(git write-tree) && break
444 # If we have a resulting tree, that means the strategy module
445 # auto resolved the merge cleanly.
446 if test '' != "$result_tree"
448 parents=$(git show-branch --independent "$head" "$@" | sed -e 's/^/-p /')
449 result_commit=$(printf '%s\n' "$merge_msg" | git commit-tree $result_tree $parents) || exit
450 finish "$result_commit" "Merge made by $wt_strategy."
455 # Pick the result from the best strategy and have the user fix it up.
456 case "$best_strategy" in
459 case "$use_strategies" in
461 echo >&2 "No merge strategy handled the merge."
464 echo >&2 "Merge with strategy $use_strategies failed."
470 # We already have its result in the working tree.
473 echo "Rewinding the tree to pristine..."
475 echo "Using the $best_strategy to prepare resolving by hand."
476 git-merge-$best_strategy $common -- "$head_arg" "$@"
480 if test "$squash" = t
487 done >"$GIT_DIR/MERGE_HEAD"
488 printf '%s\n' "$merge_msg" >"$GIT_DIR/MERGE_MSG"
491 if test "$merge_was_ok" = t
494 "Automatic merge went well; stopped before committing as requested"
501 git ls-files --unmerged |
502 sed -e 's/^[^ ]* / /' |
504 } >>"$GIT_DIR/MERGE_MSG"
506 die "Automatic merge failed; fix conflicts and then commit the result."