Andrew's git - gitweb.git/blob

   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5# Fetch one or more remote refs and merge it/them into the current HEAD.
   6
   7USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...'
   8LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
   9SUBDIRECTORY_OK=Yes
  10OPTIONS_SPEC=
  11. git-sh-setup
  12. git-sh-i18n
  13set_reflog_action "pull${1+ $*}"
  14require_work_tree_exists
  15cd_to_toplevel
  16
  17
  18die_conflict () {
  19    git diff-index --cached --name-status -r --ignore-submodules HEAD --
  20    if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
  21        die "$(gettext "Pull is not possible because you have unmerged files.
  22Please, fix them up in the work tree, and then use 'git add/rm <file>'
  23as appropriate to mark resolution, or use 'git commit -a'.")"
  24    else
  25        die "$(gettext "Pull is not possible because you have unmerged files.")"
  26    fi
  27}
  28
  29die_merge () {
  30    if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
  31        die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
  32Please, commit your changes before you can merge.")"
  33    else
  34        die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
  35    fi
  36}
  37
  38test -z "$(git ls-files -u)" || die_conflict
  39test -f "$GIT_DIR/MERGE_HEAD" && die_merge
  40
  41strategy_args= diffstat= no_commit= squash= no_ff= ff_only=
  42log_arg= verbosity= progress= recurse_submodules=
  43merge_args= edit=
  44curr_branch=$(git symbolic-ref -q HEAD)
  45curr_branch_short="${curr_branch#refs/heads/}"
  46rebase=$(git config --bool branch.$curr_branch_short.rebase)
  47if test -z "$rebase"
  48then
  49        rebase=$(git config --bool pull.rebase)
  50fi
  51dry_run=
  52while :
  53do
  54        case "$1" in
  55        -q|--quiet)
  56                verbosity="$verbosity -q" ;;
  57        -v|--verbose)
  58                verbosity="$verbosity -v" ;;
  59        --progress)
  60                progress=--progress ;;
  61        --no-progress)
  62                progress=--no-progress ;;
  63        -n|--no-stat|--no-summary)
  64                diffstat=--no-stat ;;
  65        --stat|--summary)
  66                diffstat=--stat ;;
  67        --log|--no-log)
  68                log_arg=$1 ;;
  69        --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
  70                no_commit=--no-commit ;;
  71        --c|--co|--com|--comm|--commi|--commit)
  72                no_commit=--commit ;;
  73        -e|--edit)
  74                edit=--edit ;;
  75        --no-edit)
  76                edit=--no-edit ;;
  77        --sq|--squ|--squa|--squas|--squash)
  78                squash=--squash ;;
  79        --no-sq|--no-squ|--no-squa|--no-squas|--no-squash)
  80                squash=--no-squash ;;
  81        --ff)
  82                no_ff=--ff ;;
  83        --no-ff)
  84                no_ff=--no-ff ;;
  85        --ff-only)
  86                ff_only=--ff-only ;;
  87        -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
  88                --strateg=*|--strategy=*|\
  89        -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
  90                case "$#,$1" in
  91                *,*=*)
  92                        strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
  93                1,*)
  94                        usage ;;
  95                *)
  96                        strategy="$2"
  97                        shift ;;
  98                esac
  99                strategy_args="${strategy_args}-s $strategy "
 100                ;;
 101        -X*)
 102                case "$#,$1" in
 103                1,-X)
 104                        usage ;;
 105                *,-X)
 106                        xx="-X $(git rev-parse --sq-quote "$2")"
 107                        shift ;;
 108                *,*)
 109                        xx=$(git rev-parse --sq-quote "$1") ;;
 110                esac
 111                merge_args="$merge_args$xx "
 112                ;;
 113        -r|--r|--re|--reb|--reba|--rebas|--rebase)
 114                rebase=true
 115                ;;
 116        --no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)
 117                rebase=false
 118                ;;
 119        --recurse-submodules)
 120                recurse_submodules=--recurse-submodules
 121                ;;
 122        --recurse-submodules=*)
 123                recurse_submodules="$1"
 124                ;;
 125        --no-recurse-submodules)
 126                recurse_submodules=--no-recurse-submodules
 127                ;;
 128        --d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run)
 129                dry_run=--dry-run
 130                ;;
 131        -h|--help-all)
 132                usage
 133                ;;
 134        *)
 135                # Pass thru anything that may be meant for fetch.
 136                break
 137                ;;
 138        esac
 139        shift
 140done
 141
 142error_on_no_merge_candidates () {
 143        exec >&2
 144        for opt
 145        do
 146                case "$opt" in
 147                -t|--t|--ta|--tag|--tags)
 148                        echo "Fetching tags only, you probably meant:"
 149                        echo "  git fetch --tags"
 150                        exit 1
 151                esac
 152        done
 153
 154        if test true = "$rebase"
 155        then
 156                op_type=rebase
 157                op_prep=against
 158        else
 159                op_type=merge
 160                op_prep=with
 161        fi
 162
 163        curr_branch=${curr_branch#refs/heads/}
 164        upstream=$(git config "branch.$curr_branch.merge")
 165        remote=$(git config "branch.$curr_branch.remote")
 166
 167        if [ $# -gt 1 ]; then
 168                if [ "$rebase" = true ]; then
 169                        printf "There is no candidate for rebasing against "
 170                else
 171                        printf "There are no candidates for merging "
 172                fi
 173                echo "among the refs that you just fetched."
 174                echo "Generally this means that you provided a wildcard refspec which had no"
 175                echo "matches on the remote end."
 176        elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then
 177                echo "You asked to pull from the remote '$1', but did not specify"
 178                echo "a branch. Because this is not the default configured remote"
 179                echo "for your current branch, you must specify a branch on the command line."
 180        elif [ -z "$curr_branch" -o -z "$upstream" ]; then
 181                . git-parse-remote
 182                error_on_missing_default_upstream "pull" $op_type $op_prep \
 183                        "git pull <remote> <branch>"
 184        else
 185                echo "Your configuration specifies to $op_type $op_prep the ref '${upstream#refs/heads/}'"
 186                echo "from the remote, but no such ref was fetched."
 187        fi
 188        exit 1
 189}
 190
 191test true = "$rebase" && {
 192        if ! git rev-parse -q --verify HEAD >/dev/null
 193        then
 194                # On an unborn branch
 195                if test -f "$GIT_DIR/index"
 196                then
 197                        die "$(gettext "updating an unborn branch with changes added to the index")"
 198                fi
 199        else
 200                require_clean_work_tree "pull with rebase" "Please commit or stash them."
 201        fi
 202        oldremoteref= &&
 203        test -n "$curr_branch" &&
 204        . git-parse-remote &&
 205        remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
 206        oldremoteref="$(git rev-parse -q --verify "$remoteref")" &&
 207        for reflog in $(git rev-list -g $remoteref 2>/dev/null)
 208        do
 209                if test "$reflog" = "$(git merge-base $reflog $curr_branch)"
 210                then
 211                        oldremoteref="$reflog"
 212                        break
 213                fi
 214        done
 215}
 216orig_head=$(git rev-parse -q --verify HEAD)
 217git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" || exit 1
 218test -z "$dry_run" || exit 0
 219
 220curr_head=$(git rev-parse -q --verify HEAD)
 221if test -n "$orig_head" && test "$curr_head" != "$orig_head"
 222then
 223        # The fetch involved updating the current branch.
 224
 225        # The working tree and the index file is still based on the
 226        # $orig_head commit, but we are merging into $curr_head.
 227        # First update the working tree to match $curr_head.
 228
 229        eval_gettextln "Warning: fetch updated the current branch head.
 230Warning: fast-forwarding your working tree from
 231Warning: commit \$orig_head." >&2
 232        git update-index -q --refresh
 233        git read-tree -u -m "$orig_head" "$curr_head" ||
 234                die "$(eval_gettext "Cannot fast-forward your working tree.
 235After making sure that you saved anything precious from
 236$ git diff \$orig_head
 237output, run
 238$ git reset --hard
 239to recover.")"
 240
 241fi
 242
 243merge_head=$(sed -e '/  not-for-merge   /d' \
 244        -e 's/  .*//' "$GIT_DIR"/FETCH_HEAD | \
 245        tr '\012' ' ')
 246
 247case "$merge_head" in
 248'')
 249        error_on_no_merge_candidates "$@"
 250        ;;
 251?*' '?*)
 252        if test -z "$orig_head"
 253        then
 254                die "$(gettext "Cannot merge multiple branches into empty head")"
 255        fi
 256        if test true = "$rebase"
 257        then
 258                die "$(gettext "Cannot rebase onto multiple branches")"
 259        fi
 260        ;;
 261esac
 262
 263# Pulling into unborn branch: a shorthand for branching off
 264# FETCH_HEAD, for lazy typers.
 265if test -z "$orig_head"
 266then
 267        # Two-way merge: we claim the index is based on an empty tree,
 268        # and try to fast-forward to HEAD.  This ensures we will not
 269        # lose index/worktree changes that the user already made on
 270        # the unborn branch.
 271        empty_tree=4b825dc642cb6eb9a060e54bf8d69288fbee4904
 272        git read-tree -m -u $empty_tree $merge_head &&
 273        git update-ref -m "initial pull" HEAD $merge_head "$curr_head"
 274        exit
 275fi
 276
 277if test true = "$rebase"
 278then
 279        o=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref)
 280        if test "$oldremoteref" = "$o"
 281        then
 282                unset oldremoteref
 283        fi
 284fi
 285
 286merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
 287case "$rebase" in
 288true)
 289        eval="git-rebase $diffstat $strategy_args $merge_args $verbosity"
 290        eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}"
 291        ;;
 292*)
 293        eval="git-merge $diffstat $no_commit $edit $squash $no_ff $ff_only"
 294        eval="$eval  $log_arg $strategy_args $merge_args $verbosity $progress"
 295        eval="$eval \"\$merge_name\" HEAD $merge_head"
 296        ;;
 297esac
 298eval "exec $eval"