3 # Copyright (c) 2005 Junio C Hamano
5 # Fetch one or more remote refs and merge it/them into the current HEAD.
7 USAGE
='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...'
8 LONG_USAGE
='Fetch one or more remote refs and merge it/them into the current HEAD.'
13 set_reflog_action
"pull${1+ $*}"
14 require_work_tree_exists
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.
22 Please
, fix them up
in the work tree
, and
then use
'git add/rm <file>'
23 as appropriate to mark resolution
, or use
'git commit -a'.
")"
25 die
"$(gettext "Pull is not possible because you have unmerged files.
")"
30 if [ $
(git config
--bool --get advice.resolveConflict ||
echo true
) = "true" ]; then
31 die
"$(gettext "You have not concluded your merge
(MERGE_HEAD exists
).
32 Please
, commit your changes before you can merge.
")"
34 die
"$(gettext "You have not concluded your merge
(MERGE_HEAD exists
).
")"
38 test -z "$(git ls-files -u)" || die_conflict
39 test -f "$GIT_DIR/MERGE_HEAD" && die_merge
41 strategy_args
= diffstat
= no_commit
= squash
= no_ff
= ff_only
=
42 log_arg
= verbosity
= progress
= recurse_submodules
=
44 curr_branch
=$
(git symbolic-ref
-q HEAD
)
45 curr_branch_short
="${curr_branch#refs/heads/}"
47 rebase
=$
(git config
--bool branch.
$curr_branch_short.rebase
)
50 rebase
=$
(git config
--bool pull.rebase
)
57 verbosity
="$verbosity -q" ;;
59 verbosity
="$verbosity -v" ;;
61 progress
=--progress ;;
63 progress
=--no-progress ;;
64 -n|
--no-stat|
--no-summary)
70 --no-c|
--no-co|
--no-com|
--no-comm|
--no-commi|
--no-commit)
71 no_commit
=--no-commit ;;
72 --c|
--co|
--com|
--comm|
--commi|
--commit)
74 --sq|
--squ|
--squa|
--squas|
--squash)
76 --no-sq|
--no-squ|
--no-squa|
--no-squas|
--no-squash)
84 -s=*|
--s=*|
--st=*|
--str=*|
--stra=*|
--strat=*|
--strate=*|\
85 --strateg=*|
--strategy=*|\
86 -s|
--s|
--st|
--str|
--stra|
--strat|
--strate|
--strateg|
--strategy)
89 strategy
=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
96 strategy_args
="${strategy_args}-s $strategy "
103 xx
="-X $(git rev-parse --sq-quote "$2")"
106 xx
=$
(git rev-parse
--sq-quote "$1") ;;
108 merge_args
="$merge_args$xx "
110 -r|
--r|
--re|
--reb|
--reba|
--rebas|
--rebase)
113 --rebase=i|
--rebase=interactive
)
117 --no-r|
--no-re|
--no-reb|
--no-reba|
--no-rebas|
--no-rebase)
121 --recurse-submodules)
122 recurse_submodules
=--recurse-submodules
124 --recurse-submodules=*)
125 recurse_submodules
="$1"
127 --no-recurse-submodules)
128 recurse_submodules
=--no-recurse-submodules
130 --d|
--dr|
--dry|
--dry-|
--dry-r|
--dry-ru|
--dry-run)
137 # Pass thru anything that may be meant for fetch.
144 error_on_no_merge_candidates
() {
149 -t|
--t|
--ta|
--tag|
--tags)
150 echo "Fetching tags only, you probably meant:"
151 echo " git fetch --tags"
156 if test true
= "$rebase"
165 curr_branch
=${curr_branch#refs/heads/}
166 upstream
=$
(git config
"branch.$curr_branch.merge")
167 remote
=$
(git config
"branch.$curr_branch.remote")
169 if [ $# -gt 1 ]; then
170 if [ "$rebase" = true
]; then
171 printf "There is no candidate for rebasing against "
173 printf "There are no candidates for merging "
175 echo "among the refs that you just fetched."
176 echo "Generally this means that you provided a wildcard refspec which had no"
177 echo "matches on the remote end."
178 elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then
179 echo "You asked to pull from the remote '$1', but did not specify"
180 echo "a branch. Because this is not the default configured remote"
181 echo "for your current branch, you must specify a branch on the command line."
182 elif [ -z "$curr_branch" -o -z "$upstream" ]; then
184 error_on_missing_default_upstream
"pull" $op_type $op_prep \
185 "git pull <repository> <refspec>"
187 echo "Your configuration specifies to $op_type $op_prep the ref '${upstream#refs/heads/}'"
188 echo "from the remote, but no such ref was fetched."
193 test true
= "$rebase" && {
194 if ! git rev-parse
-q --verify HEAD
>/dev
/null
196 # On an unborn branch
197 if test -f "$GIT_DIR/index"
199 die
"$(gettext "updating an unborn branch with changes added to the index
")"
202 require_clean_work_tree
"pull with rebase" "Please commit or stash them."
205 . git-parse-remote
&&
206 remoteref
="$(get_remote_merge_branch "$@
" 2>/dev/null)" &&
207 oldremoteref
="$(git rev-parse -q --verify "$remoteref")" &&
208 for reflog
in $
(git rev-list
-g $remoteref 2>/dev
/null
)
210 if test "$reflog" = "$(git merge-base $reflog $curr_branch)"
212 oldremoteref
="$reflog"
217 orig_head
=$
(git rev-parse
-q --verify HEAD
)
218 git fetch
$verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" ||
exit 1
219 test -z "$dry_run" ||
exit 0
221 curr_head
=$
(git rev-parse
-q --verify HEAD
)
222 if test -n "$orig_head" && test "$curr_head" != "$orig_head"
224 # The fetch involved updating the current branch.
226 # The working tree and the index file is still based on the
227 # $orig_head commit, but we are merging into $curr_head.
228 # First update the working tree to match $curr_head.
230 eval_gettextln
"Warning: fetch updated the current branch head.
231 Warning: fast-forwarding your working tree from
232 Warning: commit \$orig_head." >&2
233 git update-index
-q --refresh
234 git read-tree
-u -m "$orig_head" "$curr_head" ||
235 die
"$(eval_gettext "Cannot fast-forward your working tree.
236 After making sure that you saved anything precious from
237 $ git
diff \
$orig_head
244 merge_head
=$
(sed -e '/ not-for-merge /d' \
245 -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | \
248 case "$merge_head" in
250 error_on_no_merge_candidates
"$@"
253 if test -z "$orig_head"
255 die
"$(gettext "Cannot merge multiple branches into empty
head")"
257 if test true
= "$rebase"
259 die
"$(gettext "Cannot rebase onto multiple branches
")"
264 if test -z "$orig_head"
266 git update-ref
-m "initial pull" HEAD
$merge_head "$curr_head" &&
267 git read-tree
-m -u HEAD ||
exit 1
271 if test true
= "$rebase"
273 o
=$
(git show-branch
--merge-base $curr_branch $merge_head $oldremoteref)
274 if test "$oldremoteref" = "$o"
280 merge_name
=$
(git fmt-merge-msg
$log_arg <"$GIT_DIR/FETCH_HEAD") ||
exit
283 eval="git-rebase $rebase_options $diffstat $strategy_args $merge_args"
284 eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}"
287 eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only"
288 eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress"
289 eval="$eval \"\$merge_name\" HEAD $merge_head"