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" $remoteheads
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
93 if test "$show_diffstat" = t
95 # We want color (if set), but no pager
96 GIT_PAGER
='' git
diff --stat --summary -M "$head" "$1"
104 rh
=$
(git rev-parse
--verify "$remote^0" 2>/dev
/null
) ||
return
105 bh
=$
(git show-ref
-s --verify "refs/heads/$remote" 2>/dev
/null
)
106 if test "$rh" = "$bh"
108 echo "$rh branch '$remote' of ."
109 elif truname
=$
(expr "$remote" : '\(.*\)~[1-9][0-9]*$') &&
110 git show-ref
-q --verify "refs/heads/$truname" 2>/dev
/null
112 echo "$rh branch '$truname' (early part) of ."
113 elif test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD"
115 sed -e 's/ not-for-merge / /' -e 1q \
116 "$GIT_DIR/FETCH_HEAD"
118 echo "$rh commit '$remote'"
124 -n|
--n|
--no|
--no-|
--no-s|
--no-su|
--no-sum|
--no-summ|\
125 --no-summa|
--no-summar|
--no-summary)
126 show_diffstat
=false
;;
129 --sq|
--squ|
--squa|
--squas|
--squash)
130 squash
=t no_commit
=t
;;
131 --no-c|
--no-co|
--no-com|
--no-comm|
--no-commi|
--no-commit)
133 -s=*|
--s=*|
--st=*|
--str=*|
--stra=*|
--strat=*|
--strate=*|\
134 --strateg=*|
--strategy=*|\
135 -s|
--s|
--st|
--str|
--stra|
--strat|
--strate|
--strateg|
--strategy)
138 strategy
=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
145 case " $all_strategies " in
147 use_strategies
="$use_strategies$strategy " ;;
149 die
"available strategies are: $all_strategies" ;;
152 -m=*|
--m=*|
--me=*|
--mes=*|
--mess=*|
--messa=*|
--messag=*|
--message=*)
153 merge_msg
=`expr "z$1" : 'z-[^=]*=\(.*\)'`
156 -m|
--m|
--me|
--mes|
--mess|
--messa|
--messag|
--message)
174 parse_option
"$@" || usage
175 while test $args_left -lt $#
182 test $# != 0 || usage
186 if branch
=$
(git-symbolic-ref
-q HEAD
)
188 mergeopts
=$
(git config
"branch.${branch#refs/heads/}.mergeoptions")
189 if test -n "$mergeopts"
191 parse_config
$mergeopts
195 while parse_option
"$@"
197 while test $args_left -lt $#
203 if test -z "$show_diffstat"; then
204 test "$(git config --bool merge.diffstat)" = false
&& show_diffstat
=false
205 test -z "$show_diffstat" && show_diffstat
=t
208 # This could be traditional "merge <msg> HEAD <commit>..." and the
209 # way we can tell it is to see if the second token is HEAD, but some
210 # people might have misused the interface and used a committish that
211 # is the same as HEAD there instead. Traditional format never would
212 # have "-m" so it is an additional safety measure to check for it.
214 if test -z "$have_message" &&
215 second_token
=$
(git rev-parse
--verify "$2^0" 2>/dev
/null
) &&
216 head_commit
=$
(git rev-parse
--verify "HEAD" 2>/dev
/null
) &&
217 test "$second_token" = "$head_commit"
223 elif ! git rev-parse
--verify HEAD
>/dev
/null
2>&1
225 # If the merged head is a valid one there is no reason to
226 # forbid "git merge" into a branch yet to be born. We do
227 # the same for "git pull".
230 echo >&2 "Can merge only exactly one commit into empty head"
234 rh
=$
(git rev-parse
--verify "$1^0") ||
235 die
"$1 - not something we can merge"
237 git update-ref
-m "initial pull" HEAD
"$rh" "" &&
238 git read-tree
--reset -u HEAD
242 # We are invoked directly as the first-class UI.
245 # All the rest are the commits being merged; prepare
246 # the standard merge summary message to be appended to
247 # the given message. If remote is invalid we will die
248 # later in the common codepath so we discard the error
250 merge_name
=$
(for remote
253 done | git fmt-merge-msg
255 merge_msg
="${merge_msg:+$merge_msg$LF$LF}$merge_name"
257 head=$
(git rev-parse
--verify "$head_arg"^
0) || usage
259 # All the rest are remote heads
260 test "$#" = 0 && usage
;# we need at least one remote head.
261 set_reflog_action
"merge $*"
266 remotehead
=$
(git rev-parse
--verify "$remote"^
0 2>/dev
/null
) ||
267 die
"$remote - not something we can merge"
268 remoteheads
="${remoteheads}$remotehead "
269 eval GITHEAD_
$remotehead='"$remote"'
270 export GITHEAD_
$remotehead
272 set x
$remoteheads ; shift
274 case "$use_strategies" in
278 var
="`git config --get pull.twohead`"
281 use_strategies
="$var"
283 use_strategies
="$default_twohead_strategies"
286 var
="`git config --get pull.octopus`"
289 use_strategies
="$var"
291 use_strategies
="$default_octopus_strategies"
297 for s
in $use_strategies
299 for ss
in $no_fast_forward_strategies
308 for ss
in $no_trivial_strategies
312 allow_trivial_merge
=f
321 common
=$
(git merge-base
--all $head "$@")
324 common
=$
(git show-branch
--merge-base $head "$@")
327 echo "$head" >"$GIT_DIR/ORIG_HEAD"
329 case "$allow_fast_forward,$#,$common,$no_commit" in
331 # No common ancestors found. We need a real merge.
334 # If head can reach all the merge then we are up to date.
335 # but first the most common case of merging one remote.
336 finish_up_to_date
"Already up-to-date."
340 # Again the most common case of merging one remote.
341 echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $1)"
342 git update-index
--refresh 2>/dev
/null
344 if test -n "$have_message"
346 msg
="$msg (no commit created; -m option ignored)"
348 new_head
=$
(git rev-parse
--verify "$1^0") &&
349 git read-tree
-v -m -u --exclude-per-directory=.gitignore
$head "$new_head" &&
350 finish
"$new_head" "$msg" ||
exit
355 # We are not doing octopus and not fast forward. Need a
359 # We are not doing octopus, not fast forward, and have only
361 git update-index
--refresh 2>/dev
/null
362 case "$allow_trivial_merge" in
364 # See if it is really trivial.
365 git var GIT_COMMITTER_IDENT
>/dev
/null ||
exit
366 echo "Trying really trivial in-index merge..."
367 if git read-tree
--trivial -m -u -v $common $head "$1" &&
368 result_tree
=$
(git write-tree
)
372 printf '%s\n' "$merge_msg" |
373 git commit-tree
$result_tree -p HEAD
-p "$1"
375 finish
"$result_commit" "In-index merge"
383 # An octopus. If we can reach all the remote we are up to date.
387 common_one
=$
(git merge-base
--all $head $remote)
388 if test "$common_one" != "$remote"
394 if test "$up_to_date" = t
396 finish_up_to_date
"Already up-to-date. Yeeah!"
402 # We are going to make a new commit.
403 git var GIT_COMMITTER_IDENT
>/dev
/null ||
exit
405 # At this point, we need a real merge. No matter what strategy
406 # we use, it would operate on the index, possibly affecting the
407 # working tree, and when resolved cleanly, have the desired tree
408 # in the index -- this means that the index must be in sync with
409 # the $head commit. The strategies are responsible to ensure this.
411 case "$use_strategies" in
413 # Stash away the local changes so that we can try more than one.
418 rm -f "$GIT_DIR/MERGE_SAVE"
423 result_tree
= best_cnt
=-1 best_strategy
= wt_strategy
=
425 for strategy
in $use_strategies
427 test "$wt_strategy" = '' ||
{
428 echo "Rewinding the tree to pristine..."
431 case "$single_strategy" in
433 echo "Trying merge strategy $strategy..."
437 # Remember which strategy left the state in the working tree
438 wt_strategy
=$strategy
440 git-merge-
$strategy $common -- "$head_arg" "$@"
442 if test "$no_commit" = t
&& test "$exit" = 0
445 exit=1 ;# pretend it left conflicts.
448 test "$exit" = 0 ||
{
450 # The backend exits with 1 when conflicts are left to be resolved,
451 # with 2 when it does not handle the given merge at all.
453 if test "$exit" -eq 1
456 git diff-files --name-only
457 git ls-files --unmerged
459 if test $best_cnt -le 0 -o $cnt -le $best_cnt
461 best_strategy
=$strategy
468 # Automerge succeeded.
469 result_tree
=$
(git write-tree
) && break
472 # If we have a resulting tree, that means the strategy module
473 # auto resolved the merge cleanly.
474 if test '' != "$result_tree"
476 parents
=$
(git show-branch
--independent "$head" "$@" |
sed -e 's/^/-p /')
477 result_commit
=$
(printf '%s\n' "$merge_msg" | git commit-tree
$result_tree $parents) ||
exit
478 finish
"$result_commit" "Merge made by $wt_strategy."
483 # Pick the result from the best strategy and have the user fix it up.
484 case "$best_strategy" in
487 case "$use_strategies" in
489 echo >&2 "No merge strategy handled the merge."
492 echo >&2 "Merge with strategy $use_strategies failed."
498 # We already have its result in the working tree.
501 echo "Rewinding the tree to pristine..."
503 echo "Using the $best_strategy to prepare resolving by hand."
504 git-merge-
$best_strategy $common -- "$head_arg" "$@"
508 if test "$squash" = t
515 done >"$GIT_DIR/MERGE_HEAD"
516 printf '%s\n' "$merge_msg" >"$GIT_DIR/MERGE_MSG"
519 if test "$merge_was_ok" = t
522 "Automatic merge went well; stopped before committing as requested"
529 git ls-files
--unmerged |
530 sed -e 's/^[^ ]* / /' |
532 } >>"$GIT_DIR/MERGE_MSG"
534 die
"Automatic merge failed; fix conflicts and then commit the result."