⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⢠⣴⣿⣿⣿⣷⣼⣿⠀⣴⠾⠷⠶⠦⡄⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⢠⡤⢶⣦⣾⣿⣿⣿⣿⣿⣿⣿⠀⣿⣶⣶⣦⣄⠳⣤⣤⠄⠀⠀⠀ ⠀⠀⠀⢀⣼⣳⡿⢻⣿⣿⣿⣿⣿⣿⣿⣿⣶⣿⣿⣗⠈⠙⠻⣶⣄⡀⠀⠀⠀ ⠀⠀⠀⣰⠿⠁⢀⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡄⠀⠀⠈⠳⣤⠀⠀ ⠀⠀⢀⡟⠀⢰⣿⠟⠻⢿⣿⣿⣿⣿⣿⣿⣿⣿⠉⠁⠈⠻⣶⣄⠀⠀⠈⠛⢦ ⠀⣀⡼⠃⠀⣼⡟⠀⠀⢸⣿⡿⠉⣿⡿⠿⠛⣿⡄⠀⠀⠀⠙⠿⣆⠀⠀⠀⠈ ⠈⠁⠀⠀⢸⡟⠀⠀⠀⢸⣿⠀⠀⣿⠁⠀⠀⠈⠃⠀⠀⠀⠀⠀⠘⢷⡄⠀⠀ ⠀⠀⠀⠀⣼⠃⠀⠀⠀⢸⡟⠀⠀⡿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⡆⠀ ⠀⠀⠀⣠⡏⠀⠀⠀⠀⣼⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠻⠃⠀⠀⠀⠀⣻⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠻⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ Current Dir: /usr/libexec/git-core/ [DIR] mergetools [ delete | rename ] [FILE] git [ edit | delete | rename | download ] [FILE] git-add [ edit | delete | rename | download ] [FILE] git-add--interactive [ edit | delete | rename | download ] [FILE] git-am [ edit | delete | rename | download ] [FILE] git-annotate [ edit | delete | rename | download ] [FILE] git-apply [ edit | delete | rename | download ] [FILE] git-archive [ edit | delete | rename | download ] [FILE] git-bisect [ edit | delete | rename | download ] [FILE] git-bisect--helper [ edit | delete | rename | download ] [FILE] git-blame [ edit | delete | rename | download ] [FILE] git-branch [ edit | delete | rename | download ] [FILE] git-bundle [ edit | delete | rename | download ] [FILE] git-cat-file [ edit | delete | rename | download ] [FILE] git-check-attr [ edit | delete | rename | download ] [FILE] git-check-ignore [ edit | delete | rename | download ] [FILE] git-check-ref-format [ edit | delete | rename | download ] [FILE] git-checkout [ edit | delete | rename | download ] [FILE] git-checkout-index [ edit | delete | rename | download ] [FILE] git-cherry [ edit | delete | rename | download ] [FILE] git-cherry-pick [ edit | delete | rename | download ] [FILE] git-clean [ edit | delete | rename | download ] [FILE] git-clone [ edit | delete | rename | download ] [FILE] git-column [ edit | delete | rename | download ] [FILE] git-commit [ edit | delete | rename | download ] [FILE] git-commit-tree [ edit | delete | rename | download ] [FILE] git-config [ edit | delete | rename | download ] [FILE] git-count-objects [ edit | delete | rename | download ] [FILE] git-credential [ edit | delete | rename | download ] [FILE] git-credential-cache [ edit | delete | rename | download ] [FILE] git-credential-cache--daemon [ edit | delete | rename | download ] [FILE] git-credential-store [ edit | delete | rename | download ] [FILE] git-describe [ edit | delete | rename | download ] [FILE] git-diff [ edit | delete | rename | download ] [FILE] git-diff-files [ edit | delete | rename | download ] [FILE] git-diff-index [ edit | delete | rename | download ] [FILE] git-diff-tree [ edit | delete | rename | download ] [FILE] git-difftool [ edit | delete | rename | download ] [FILE] git-difftool--helper [ edit | delete | rename | download ] [FILE] git-fast-export [ edit | delete | rename | download ] [FILE] git-fast-import [ edit | delete | rename | download ] [FILE] git-fetch [ edit | delete | rename | download ] [FILE] git-fetch-pack [ edit | delete | rename | download ] [FILE] git-filter-branch [ edit | delete | rename | download ] [FILE] git-fmt-merge-msg [ edit | delete | rename | download ] [FILE] git-for-each-ref [ edit | delete | rename | download ] [FILE] git-format-patch [ edit | delete | rename | download ] [FILE] git-fsck [ edit | delete | rename | download ] [FILE] git-fsck-objects [ edit | delete | rename | download ] [FILE] git-gc [ edit | delete | rename | download ] [FILE] git-get-tar-commit-id [ edit | delete | rename | download ] [FILE] git-grep [ edit | delete | rename | download ] [FILE] git-hash-object [ edit | delete | rename | download ] [FILE] git-help [ edit | delete | rename | download ] [FILE] git-http-backend [ edit | delete | rename | download ] [FILE] git-http-fetch [ edit | delete | rename | download ] [FILE] git-http-push [ edit | delete | rename | download ] [FILE] git-imap-send [ edit | delete | rename | download ] [FILE] git-index-pack [ edit | delete | rename | download ] [FILE] git-init [ edit | delete | rename | download ] [FILE] git-init-db [ edit | delete | rename | download ] [FILE] git-log [ edit | delete | rename | download ] [FILE] git-lost-found [ edit | delete | rename | download ] [FILE] git-ls-files [ edit | delete | rename | download ] [FILE] git-ls-remote [ edit | delete | rename | download ] [FILE] git-ls-tree [ edit | delete | rename | download ] [FILE] git-mailinfo [ edit | delete | rename | download ] [FILE] git-mailsplit [ edit | delete | rename | download ] [FILE] git-merge [ edit | delete | rename | download ] [FILE] git-merge-base [ edit | delete | rename | download ] [FILE] git-merge-file [ edit | delete | rename | download ] [FILE] git-merge-index [ edit | delete | rename | download ] [FILE] git-merge-octopus [ edit | delete | rename | download ] [FILE] git-merge-one-file [ edit | delete | rename | download ] [FILE] git-merge-ours [ edit | delete | rename | download ] [FILE] git-merge-recursive [ edit | delete | rename | download ] [FILE] git-merge-resolve [ edit | delete | rename | download ] [FILE] git-merge-subtree [ edit | delete | rename | download ] [FILE] git-merge-tree [ edit | delete | rename | download ] [FILE] git-mergetool [ edit | delete | rename | download ] [FILE] git-mergetool--lib [ edit | delete | rename | download ] [FILE] git-mktag [ edit | delete | rename | download ] [FILE] git-mktree [ edit | delete | rename | download ] [FILE] git-mv [ edit | delete | rename | download ] [FILE] git-name-rev [ edit | delete | rename | download ] [FILE] git-notes [ edit | delete | rename | download ] [FILE] git-pack-objects [ edit | delete | rename | download ] [FILE] git-pack-redundant [ edit | delete | rename | download ] [FILE] git-pack-refs [ edit | delete | rename | download ] [FILE] git-parse-remote [ edit | delete | rename | download ] [FILE] git-patch-id [ edit | delete | rename | download ] [FILE] git-peek-remote [ edit | delete | rename | download ] [FILE] git-prune [ edit | delete | rename | download ] [FILE] git-prune-packed [ edit | delete | rename | download ] [FILE] git-pull [ edit | delete | rename | download ] [FILE] git-push [ edit | delete | rename | download ] [FILE] git-quiltimport [ edit | delete | rename | download ] [FILE] git-read-tree [ edit | delete | rename | download ] [FILE] git-rebase [ edit | delete | rename | download ] [FILE] git-rebase--am [ edit | delete | rename | download ] [FILE] git-rebase--interactive [ edit | delete | rename | download ] [FILE] git-rebase--merge [ edit | delete | rename | download ] [FILE] git-receive-pack [ edit | delete | rename | download ] [FILE] git-reflog [ edit | delete | rename | download ] [FILE] git-relink [ edit | delete | rename | download ] [FILE] git-remote [ edit | delete | rename | download ] [FILE] git-remote-ext [ edit | delete | rename | download ] [FILE] git-remote-fd [ edit | delete | rename | download ] [FILE] git-remote-ftp [ edit | delete | rename | download ] [FILE] git-remote-ftps [ edit | delete | rename | download ] [FILE] git-remote-http [ edit | delete | rename | download ] [FILE] git-remote-https [ edit | delete | rename | download ] [FILE] git-remote-testpy [ edit | delete | rename | download ] [FILE] git-repack [ edit | delete | rename | download ] [FILE] git-replace [ edit | delete | rename | download ] [FILE] git-repo-config [ edit | delete | rename | download ] [FILE] git-request-pull [ edit | delete | rename | download ] [FILE] git-rerere [ edit | delete | rename | download ] [FILE] git-reset [ edit | delete | rename | download ] [FILE] git-rev-list [ edit | delete | rename | download ] [FILE] git-rev-parse [ edit | delete | rename | download ] [FILE] git-revert [ edit | delete | rename | download ] [FILE] git-rm [ edit | delete | rename | download ] [FILE] git-send-pack [ edit | delete | rename | download ] [FILE] git-sh-i18n [ edit | delete | rename | download ] [FILE] git-sh-i18n--envsubst [ edit | delete | rename | download ] [FILE] git-sh-setup [ edit | delete | rename | download ] [FILE] git-shell [ edit | delete | rename | download ] [FILE] git-shortlog [ edit | delete | rename | download ] [FILE] git-show [ edit | delete | rename | download ] [FILE] git-show-branch [ edit | delete | rename | download ] [FILE] git-show-index [ edit | delete | rename | download ] [FILE] git-show-ref [ edit | delete | rename | download ] [FILE] git-stage [ edit | delete | rename | download ] [FILE] git-stash [ edit | delete | rename | download ] [FILE] git-status [ edit | delete | rename | download ] [FILE] git-stripspace [ edit | delete | rename | download ] [FILE] git-submodule [ edit | delete | rename | download ] [FILE] git-submodule--helper [ edit | delete | rename | download ] [FILE] git-subtree [ edit | delete | rename | download ] [FILE] git-symbolic-ref [ edit | delete | rename | download ] [FILE] git-tag [ edit | delete | rename | download ] [FILE] git-tar-tree [ edit | delete | rename | download ] [FILE] git-unpack-file [ edit | delete | rename | download ] [FILE] git-unpack-objects [ edit | delete | rename | download ] [FILE] git-update-index [ edit | delete | rename | download ] [FILE] git-update-ref [ edit | delete | rename | download ] [FILE] git-update-server-info [ edit | delete | rename | download ] [FILE] git-upload-archive [ edit | delete | rename | download ] [FILE] git-upload-pack [ edit | delete | rename | download ] [FILE] git-var [ edit | delete | rename | download ] [FILE] git-verify-pack [ edit | delete | rename | download ] [FILE] git-verify-tag [ edit | delete | rename | download ] [FILE] git-web--browse [ edit | delete | rename | download ] [FILE] git-whatchanged [ edit | delete | rename | download ] [FILE] git-write-tree [ edit | delete | rename | download ] Viewing: /usr/libexec/git-core/git-pull #!/bin/sh # # Copyright (c) 2005 Junio C Hamano # # Fetch one or more remote refs and merge it/them into the current HEAD. USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...' LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.' SUBDIRECTORY_OK=Yes OPTIONS_SPEC= . git-sh-setup . git-sh-i18n set_reflog_action "pull${1+ $*}" require_work_tree_exists cd_to_toplevel die_conflict () { git diff-index --cached --name-status -r --ignore-submodules HEAD -- if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then die "$(gettext "Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>' as appropriate to mark resolution, or use 'git commit -a'.")" else die "$(gettext "Pull is not possible because you have unmerged files.")" fi } die_merge () { if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then die "$(gettext "You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can merge.")" else die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")" fi } test -z "$(git ls-files -u)" || die_conflict test -f "$GIT_DIR/MERGE_HEAD" && die_merge strategy_args= diffstat= no_commit= squash= no_ff= ff_only= log_arg= verbosity= progress= recurse_submodules= verify_signatures= merge_args= edit= curr_branch=$(git symbolic-ref -q HEAD) curr_branch_short="${curr_branch#refs/heads/}" rebase=$(git config --bool branch.$curr_branch_short.rebase) if test -z "$rebase" then rebase=$(git config --bool pull.rebase) fi dry_run= while : do case "$1" in -q|--quiet) verbosity="$verbosity -q" ;; -v|--verbose) verbosity="$verbosity -v" ;; --progress) progress=--progress ;; --no-progress) progress=--no-progress ;; -n|--no-stat|--no-summary) diffstat=--no-stat ;; --stat|--summary) diffstat=--stat ;; --log|--no-log) log_arg=$1 ;; --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) no_commit=--no-commit ;; --c|--co|--com|--comm|--commi|--commit) no_commit=--commit ;; -e|--edit) edit=--edit ;; --no-edit) edit=--no-edit ;; --sq|--squ|--squa|--squas|--squash) squash=--squash ;; --no-sq|--no-squ|--no-squa|--no-squas|--no-squash) squash=--no-squash ;; --ff) no_ff=--ff ;; --no-ff) no_ff=--no-ff ;; --ff-only) ff_only=--ff-only ;; -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ --strateg=*|--strategy=*|\ -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) case "$#,$1" in *,*=*) strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;; 1,*) usage ;; *) strategy="$2" shift ;; esac strategy_args="${strategy_args}-s $strategy " ;; -X*) case "$#,$1" in 1,-X) usage ;; *,-X) xx="-X $(git rev-parse --sq-quote "$2")" shift ;; *,*) xx=$(git rev-parse --sq-quote "$1") ;; esac merge_args="$merge_args$xx " ;; -r|--r|--re|--reb|--reba|--rebas|--rebase) rebase=true ;; --no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase) rebase=false ;; --recurse-submodules) recurse_submodules=--recurse-submodules ;; --recurse-submodules=*) recurse_submodules="$1" ;; --no-recurse-submodules) recurse_submodules=--no-recurse-submodules ;; --verify-signatures) verify_signatures=--verify-signatures ;; --no-verify-signatures) verify_signatures=--no-verify-signatures ;; --d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run) dry_run=--dry-run ;; -h|--help-all) usage ;; *) # Pass thru anything that may be meant for fetch. break ;; esac shift done error_on_no_merge_candidates () { exec >&2 for opt do case "$opt" in -t|--t|--ta|--tag|--tags) echo "Fetching tags only, you probably meant:" echo " git fetch --tags" exit 1 esac done if test true = "$rebase" then op_type=rebase op_prep=against else op_type=merge op_prep=with fi curr_branch=${curr_branch#refs/heads/} upstream=$(git config "branch.$curr_branch.merge") remote=$(git config "branch.$curr_branch.remote") if [ $# -gt 1 ]; then if [ "$rebase" = true ]; then printf "There is no candidate for rebasing against " else printf "There are no candidates for merging " fi echo "among the refs that you just fetched." echo "Generally this means that you provided a wildcard refspec which had no" echo "matches on the remote end." elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then echo "You asked to pull from the remote '$1', but did not specify" echo "a branch. Because this is not the default configured remote" echo "for your current branch, you must specify a branch on the command line." elif [ -z "$curr_branch" -o -z "$upstream" ]; then . git-parse-remote error_on_missing_default_upstream "pull" $op_type $op_prep \ "git pull <remote> <branch>" else echo "Your configuration specifies to $op_type $op_prep the ref '${upstream#refs/heads/}'" echo "from the remote, but no such ref was fetched." fi exit 1 } test true = "$rebase" && { if ! git rev-parse -q --verify HEAD >/dev/null then # On an unborn branch if test -f "$GIT_DIR/index" then die "$(gettext "updating an unborn branch with changes added to the index")" fi else require_clean_work_tree "pull with rebase" "Please commit or stash them." fi oldremoteref= && test -n "$curr_branch" && . git-parse-remote && remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" && oldremoteref="$(git rev-parse -q --verify "$remoteref")" && for reflog in $(git rev-list -g $remoteref 2>/dev/null) do if test "$reflog" = "$(git merge-base $reflog $curr_branch)" then oldremoteref="$reflog" break fi done } orig_head=$(git rev-parse -q --verify HEAD) git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" || exit 1 test -z "$dry_run" || exit 0 curr_head=$(git rev-parse -q --verify HEAD) if test -n "$orig_head" && test "$curr_head" != "$orig_head" then # The fetch involved updating the current branch. # The working tree and the index file is still based on the # $orig_head commit, but we are merging into $curr_head. # First update the working tree to match $curr_head. eval_gettextln "Warning: fetch updated the current branch head. Warning: fast-forwarding your working tree from Warning: commit \$orig_head." >&2 git update-index -q --refresh git read-tree -u -m "$orig_head" "$curr_head" || die "$(eval_gettext "Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff \$orig_head output, run $ git reset --hard to recover.")" fi merge_head=$(sed -e '/ not-for-merge /d' \ -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | \ tr '\012' ' ') case "$merge_head" in '') error_on_no_merge_candidates "$@" ;; ?*' '?*) if test -z "$orig_head" then die "$(gettext "Cannot merge multiple branches into empty head")" fi if test true = "$rebase" then die "$(gettext "Cannot rebase onto multiple branches")" fi ;; esac if test -z "$orig_head" then git update-ref -m "initial pull" HEAD $merge_head "$curr_head" && git read-tree -m -u HEAD || exit 1 exit fi if test true = "$rebase" then o=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref) if test "$oldremoteref" = "$o" then unset oldremoteref fi fi merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit case "$rebase" in true) eval="git-rebase $diffstat $strategy_args $merge_args $verbosity" eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}" ;; *) eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only" eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress" eval="$eval \"\$merge_name\" HEAD $merge_head" ;; esac eval "exec $eval"