git-merge.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2005 Junio C Hamano
   4 #
   5
   6 USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
   7
   8 SUBDIRECTORY_OK=Yes
   9 . git-sh-setup
  10 require_work_tree
  11 cd_to_toplevel
  12
  13 test -z "$(git ls-files -u)" ||
  14         die "You are in the middle of a conflicted merge."
  15
  16 LF='
  17 '
  18
  19 all_strategies='recur recursive octopus resolve stupid ours'
  20 default_twohead_strategies='recursive'
  21 default_octopus_strategies='octopus'
  22 no_trivial_merge_strategies='ours'
  23 use_strategies=
  24
  25 index_merge=t
  26
  27 dropsave() {
  28         rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
  29                  "$GIT_DIR/MERGE_SAVE" || exit 1
  30 }
  31
  32 savestate() {
  33         # Stash away any local modifications.
  34         git-diff-index -z --name-only $head |
  35         cpio -0 -o >"$GIT_DIR/MERGE_SAVE"
  36 }
  37
  38 restorestate() {
  39         if test -f "$GIT_DIR/MERGE_SAVE"
  40         then
  41                 git reset --hard $head >/dev/null
  42                 cpio -iuv <"$GIT_DIR/MERGE_SAVE"
  43                 git-update-index --refresh >/dev/null
  44         fi
  45 }
  46
  47 finish_up_to_date () {
  48         case "$squash" in
  49         t)
  50                 echo "$1 (nothing to squash)" ;;
  51         '')
  52                 echo "$1" ;;
  53         esac
  54         dropsave
  55 }
  56
  57 squash_message () {
  58         echo Squashed commit of the following:
  59         echo
  60         git-log --no-merges ^"$head" $remote
  61 }
  62
  63 finish () {
  64         if test '' = "$2"
  65         then
  66                 rlogm="$GIT_REFLOG_ACTION"
  67         else
  68                 echo "$2"
  69                 rlogm="$GIT_REFLOG_ACTION: $2"
  70         fi
  71         case "$squash" in
  72         t)
  73                 echo "Squash commit -- not updating HEAD"
  74                 squash_message >"$GIT_DIR/SQUASH_MSG"
  75                 ;;
  76         '')
  77                 case "$merge_msg" in
  78                 '')
  79                         echo "No merge message -- not updating HEAD"
  80                         ;;
  81                 *)
  82                         git-update-ref -m "$rlogm" HEAD "$1" "$head" || exit 1
  83                         ;;
  84                 esac
  85                 ;;
  86         esac
  87         case "$1" in
  88         '')
  89                 ;;
  90         ?*)
  91                 case "$no_summary" in
  92                 '')
  93                         git-diff-tree --stat --summary -M "$head" "$1"
  94                         ;;
  95                 esac
  96                 ;;
  97         esac
  98 }
  99
 100 merge_name () {
 101         remote="$1"
 102         rh=$(git-rev-parse --verify "$remote^0" 2>/dev/null) || return
 103         bh=$(git-show-ref -s --verify "refs/heads/$remote" 2>/dev/null)
 104         if test "$rh" = "$bh"
 105         then
 106                 echo "$rh               branch '$remote' of ."
 107         elif truname=$(expr "$remote" : '\(.*\)~[1-9][0-9]*$') &&
 108                 git-show-ref -q --verify "refs/heads/$truname" 2>/dev/null
 109         then
 110                 echo "$rh               branch '$truname' (early part) of ."
 111         else
 112                 echo "$rh               commit '$remote'"
 113         fi
 114 }
 115
 116 case "$#" in 0) usage ;; esac
 117
 118 have_message=
 119 while case "$#" in 0) break ;; esac
 120 do
 121         case "$1" in
 122         -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
 123                 --no-summa|--no-summar|--no-summary)
 124                 no_summary=t ;;
 125         --sq|--squ|--squa|--squas|--squash)
 126                 squash=t no_commit=t ;;
 127         --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
 128                 no_commit=t ;;
 129         -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
 130                 --strateg=*|--strategy=*|\
 131         -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
 132                 case "$#,$1" in
 133                 *,*=*)
 134                         strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
 135                 1,*)
 136                         usage ;;
 137                 *)
 138                         strategy="$2"
 139                         shift ;;
 140                 esac
 141                 case " $all_strategies " in
 142                 *" $strategy "*)
 143                         use_strategies="$use_strategies$strategy " ;;
 144                 *)
 145                         die "available strategies are: $all_strategies" ;;
 146                 esac
 147                 ;;
 148         -m=*|--m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
 149                 merge_msg=`expr "z$1" : 'z-[^=]*=\(.*\)'`
 150                 have_message=t
 151                 ;;
 152         -m|--m|--me|--mes|--mess|--messa|--messag|--message)
 153                 shift
 154                 case "$#" in
 155                 1)      usage ;;
 156                 esac
 157                 merge_msg="$1"
 158                 have_message=t
 159                 ;;
 160         -*)     usage ;;
 161         *)      break ;;
 162         esac
 163         shift
 164 done
 165
 166 # This could be traditional "merge <msg> HEAD <commit>..."  and the
 167 # way we can tell it is to see if the second token is HEAD, but some
 168 # people might have misused the interface and used a committish that
 169 # is the same as HEAD there instead.  Traditional format never would
 170 # have "-m" so it is an additional safety measure to check for it.
 171
 172 if test -z "$have_message" &&
 173         second_token=$(git-rev-parse --verify "$2^0" 2>/dev/null) &&
 174         head_commit=$(git-rev-parse --verify "HEAD" 2>/dev/null) &&
 175         test "$second_token" = "$head_commit"
 176 then
 177         merge_msg="$1"
 178         shift
 179         head_arg="$1"
 180         shift
 181 elif ! git-rev-parse --verify HEAD >/dev/null 2>&1
 182 then
 183         # If the merged head is a valid one there is no reason to
 184         # forbid "git merge" into a branch yet to be born.  We do
 185         # the same for "git pull".
 186         if test 1 -ne $#
 187         then
 188                 echo >&2 "Can merge only exactly one commit into empty head"
 189                 exit 1
 190         fi
 191
 192         rh=$(git rev-parse --verify "$1^0") ||
 193                 die "$1 - not something we can merge"
 194
 195         git-update-ref -m "initial pull" HEAD "$rh" "" &&
 196         git-read-tree --reset -u HEAD
 197         exit
 198
 199 else
 200         # We are invoked directly as the first-class UI.
 201         head_arg=HEAD
 202
 203         # All the rest are the commits being merged; prepare
 204         # the standard merge summary message to be appended to
 205         # the given message.  If remote is invalid we will die
 206         # later in the common codepath so we discard the error
 207         # in this loop.
 208         merge_name=$(for remote
 209                 do
 210                         merge_name "$remote"
 211                 done | git-fmt-merge-msg
 212         )
 213         merge_msg="${merge_msg:+$merge_msg$LF$LF}$merge_name"
 214 fi
 215 head=$(git-rev-parse --verify "$head_arg"^0) || usage
 216
 217 # All the rest are remote heads
 218 test "$#" = 0 && usage ;# we need at least one remote head.
 219 set_reflog_action "merge $*"
 220
 221 remoteheads=
 222 for remote
 223 do
 224         remotehead=$(git-rev-parse --verify "$remote"^0 2>/dev/null) ||
 225             die "$remote - not something we can merge"
 226         remoteheads="${remoteheads}$remotehead "
 227         eval GITHEAD_$remotehead='"$remote"'
 228         export GITHEAD_$remotehead
 229 done
 230 set x $remoteheads ; shift
 231
 232 case "$use_strategies" in
 233 '')
 234         case "$#" in
 235         1)
 236                 var="`git-config --get pull.twohead`"
 237                 if test -n "$var"
 238                 then
 239                         use_strategies="$var"
 240                 else
 241                         use_strategies="$default_twohead_strategies"
 242                 fi ;;
 243         *)
 244                 var="`git-config --get pull.octopus`"
 245                 if test -n "$var"
 246                 then
 247                         use_strategies="$var"
 248                 else
 249                         use_strategies="$default_octopus_strategies"
 250                 fi ;;
 251         esac
 252         ;;
 253 esac
 254
 255 for s in $use_strategies
 256 do
 257         for nt in $no_trivial_merge_strategies
 258         do
 259                 case " $s " in
 260                 *" $nt "*)
 261                         index_merge=f
 262                         break
 263                         ;;
 264                 esac
 265         done
 266 done
 267
 268 case "$#" in
 269 1)
 270         common=$(git-merge-base --all $head "$@")
 271         ;;
 272 *)
 273         common=$(git-show-branch --merge-base $head "$@")
 274         ;;
 275 esac
 276 echo "$head" >"$GIT_DIR/ORIG_HEAD"
 277
 278 case "$index_merge,$#,$common,$no_commit" in
 279 f,*)
 280         # We've been told not to try anything clever.  Skip to real merge.
 281         ;;
 282 ?,*,'',*)
 283         # No common ancestors found. We need a real merge.
 284         ;;
 285 ?,1,"$1",*)
 286         # If head can reach all the merge then we are up to date.
 287         # but first the most common case of merging one remote.
 288         finish_up_to_date "Already up-to-date."
 289         exit 0
 290         ;;
 291 ?,1,"$head",*)
 292         # Again the most common case of merging one remote.
 293         echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
 294         git-update-index --refresh 2>/dev/null
 295         new_head=$(git-rev-parse --verify "$1^0") &&
 296         git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
 297         finish "$new_head" "Fast forward"
 298         dropsave
 299         exit 0
 300         ;;
 301 ?,1,?*"$LF"?*,*)
 302         # We are not doing octopus and not fast forward.  Need a
 303         # real merge.
 304         ;;
 305 ?,1,*,)
 306         # We are not doing octopus, not fast forward, and have only
 307         # one common.
 308         git-update-index --refresh 2>/dev/null
 309         case " $use_strategies " in
 310         *' recursive '*|*' recur '*)
 311                 : run merge later
 312                 ;;
 313         *)
 314                 # See if it is really trivial.
 315                 git var GIT_COMMITTER_IDENT >/dev/null || exit
 316                 echo "Trying really trivial in-index merge..."
 317                 if git-read-tree --trivial -m -u -v $common $head "$1" &&
 318                    result_tree=$(git-write-tree)
 319                 then
 320                         echo "Wonderful."
 321                         result_commit=$(
 322                                 echo "$merge_msg" |
 323                                 git-commit-tree $result_tree -p HEAD -p "$1"
 324                         ) || exit
 325                         finish "$result_commit" "In-index merge"
 326                         dropsave
 327                         exit 0
 328                 fi
 329                 echo "Nope."
 330         esac
 331         ;;
 332 *)
 333         # An octopus.  If we can reach all the remote we are up to date.
 334         up_to_date=t
 335         for remote
 336         do
 337                 common_one=$(git-merge-base --all $head $remote)
 338                 if test "$common_one" != "$remote"
 339                 then
 340                         up_to_date=f
 341                         break
 342                 fi
 343         done
 344         if test "$up_to_date" = t
 345         then
 346                 finish_up_to_date "Already up-to-date. Yeeah!"
 347                 exit 0
 348         fi
 349         ;;
 350 esac
 351
 352 # We are going to make a new commit.
 353 git var GIT_COMMITTER_IDENT >/dev/null || exit
 354
 355 # At this point, we need a real merge.  No matter what strategy
 356 # we use, it would operate on the index, possibly affecting the
 357 # working tree, and when resolved cleanly, have the desired tree
 358 # in the index -- this means that the index must be in sync with
 359 # the $head commit.  The strategies are responsible to ensure this.
 360
 361 case "$use_strategies" in
 362 ?*' '?*)
 363     # Stash away the local changes so that we can try more than one.
 364     savestate
 365     single_strategy=no
 366     ;;
 367 *)
 368     rm -f "$GIT_DIR/MERGE_SAVE"
 369     single_strategy=yes
 370     ;;
 371 esac
 372
 373 result_tree= best_cnt=-1 best_strategy= wt_strategy=
 374 merge_was_ok=
 375 for strategy in $use_strategies
 376 do
 377     test "$wt_strategy" = '' || {
 378         echo "Rewinding the tree to pristine..."
 379         restorestate
 380     }
 381     case "$single_strategy" in
 382     no)
 383         echo "Trying merge strategy $strategy..."
 384         ;;
 385     esac
 386
 387     # Remember which strategy left the state in the working tree
 388     wt_strategy=$strategy
 389
 390     git-merge-$strategy $common -- "$head_arg" "$@"
 391     exit=$?
 392     if test "$no_commit" = t && test "$exit" = 0
 393     then
 394         merge_was_ok=t
 395         exit=1 ;# pretend it left conflicts.
 396     fi
 397
 398     test "$exit" = 0 || {
 399
 400         # The backend exits with 1 when conflicts are left to be resolved,
 401         # with 2 when it does not handle the given merge at all.
 402
 403         if test "$exit" -eq 1
 404         then
 405             cnt=`{
 406                 git-diff-files --name-only
 407                 git-ls-files --unmerged
 408             } | wc -l`
 409             if test $best_cnt -le 0 -o $cnt -le $best_cnt
 410             then
 411                 best_strategy=$strategy
 412                 best_cnt=$cnt
 413             fi
 414         fi
 415         continue
 416     }
 417
 418     # Automerge succeeded.
 419     result_tree=$(git-write-tree) && break
 420 done
 421
 422 # If we have a resulting tree, that means the strategy module
 423 # auto resolved the merge cleanly.
 424 if test '' != "$result_tree"
 425 then
 426     parents=$(git-show-branch --independent "$head" "$@" | sed -e 's/^/-p /')
 427     result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents) || exit
 428     finish "$result_commit" "Merge made by $wt_strategy."
 429     dropsave
 430     exit 0
 431 fi
 432
 433 # Pick the result from the best strategy and have the user fix it up.
 434 case "$best_strategy" in
 435 '')
 436         restorestate
 437         case "$use_strategies" in
 438         ?*' '?*)
 439                 echo >&2 "No merge strategy handled the merge."
 440                 ;;
 441         *)
 442                 echo >&2 "Merge with strategy $use_strategies failed."
 443                 ;;
 444         esac
 445         exit 2
 446         ;;
 447 "$wt_strategy")
 448         # We already have its result in the working tree.
 449         ;;
 450 *)
 451         echo "Rewinding the tree to pristine..."
 452         restorestate
 453         echo "Using the $best_strategy to prepare resolving by hand."
 454         git-merge-$best_strategy $common -- "$head_arg" "$@"
 455         ;;
 456 esac
 457
 458 if test "$squash" = t
 459 then
 460         finish
 461 else
 462         for remote
 463         do
 464                 echo $remote
 465         done >"$GIT_DIR/MERGE_HEAD"
 466         echo "$merge_msg" >"$GIT_DIR/MERGE_MSG"
 467 fi
 468
 469 if test "$merge_was_ok" = t
 470 then
 471         echo >&2 \
 472         "Automatic merge went well; stopped before committing as requested"
 473         exit 0
 474 else
 475         {
 476             echo '
 477 Conflicts:
 478 '
 479                 git ls-files --unmerged |
 480                 sed -e 's/^[^   ]*      /       /' |
 481                 uniq
 482         } >>"$GIT_DIR/MERGE_MSG"
 483         if test -d "$GIT_DIR/rr-cache"
 484         then
 485                 git-rerere
 486         fi
 487         die "Automatic merge failed; fix conflicts and then commit the result."
 488 fi