]>
Commit | Line | Data |
---|---|---|
839a7a06 LT |
1 | #!/bin/sh |
2 | # | |
521003ff JH |
3 | # Copyright (c) 2005 Junio C Hamano |
4 | # | |
5 | # Fetch one or more remote refs and merge it/them into the current HEAD. | |
6 | ||
d8abe148 | 7 | USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...' |
806f36d4 | 8 | LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.' |
533b7039 | 9 | SUBDIRECTORY_OK=Yes |
8f321a39 | 10 | OPTIONS_SPEC= |
ae2b0f15 | 11 | . git-sh-setup |
a9f57868 | 12 | . git-sh-i18n |
c98d1e41 | 13 | set_reflog_action "pull${1+ $*}" |
035b5bf6 | 14 | require_work_tree_exists |
533b7039 | 15 | cd_to_toplevel |
b10ac50f | 16 | |
d38a30df MM |
17 | |
18 | die_conflict () { | |
19 | git diff-index --cached --name-status -r --ignore-submodules HEAD -- | |
20 | if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then | |
85af5f82 | 21 | die "$(gettext "Pull is not possible because you have unmerged files. |
d38a30df | 22 | Please, fix them up in the work tree, and then use 'git add/rm <file>' |
85af5f82 | 23 | as appropriate to mark resolution, or use 'git commit -a'.")" |
d38a30df | 24 | else |
85af5f82 | 25 | die "$(gettext "Pull is not possible because you have unmerged files.")" |
d38a30df MM |
26 | fi |
27 | } | |
28 | ||
29 | die_merge () { | |
30 | if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then | |
85af5f82 ÆAB |
31 | die "$(gettext "You have not concluded your merge (MERGE_HEAD exists). |
32 | Please, commit your changes before you can merge.")" | |
d38a30df | 33 | else |
85af5f82 | 34 | die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")" |
d38a30df MM |
35 | fi |
36 | } | |
37 | ||
38 | test -z "$(git ls-files -u)" || die_conflict | |
39 | test -f "$GIT_DIR/MERGE_HEAD" && die_merge | |
d1014a17 | 40 | |
13474835 | 41 | strategy_args= diffstat= no_commit= squash= no_ff= ff_only= |
7dce19d3 | 42 | log_arg= verbosity= progress= recurse_submodules= |
85808300 | 43 | merge_args= edit= |
cd67e4d4 | 44 | curr_branch=$(git symbolic-ref -q HEAD) |
0d12e59f | 45 | curr_branch_short="${curr_branch#refs/heads/}" |
cd67e4d4 | 46 | rebase=$(git config --bool branch.$curr_branch_short.rebase) |
6b37dff1 ÆAB |
47 | if test -z "$rebase" |
48 | then | |
49 | rebase=$(git config --bool pull.rebase) | |
50 | fi | |
29609e68 | 51 | dry_run= |
822f7c73 | 52 | while : |
60fb5b2c JH |
53 | do |
54 | case "$1" in | |
7f87aff2 | 55 | -q|--quiet) |
c6576f91 | 56 | verbosity="$verbosity -q" ;; |
7f87aff2 | 57 | -v|--verbose) |
c6576f91 | 58 | verbosity="$verbosity -v" ;; |
9839018e TRC |
59 | --progress) |
60 | progress=--progress ;; | |
bebd2fd7 JK |
61 | --no-progress) |
62 | progress=--no-progress ;; | |
d8abe148 | 63 | -n|--no-stat|--no-summary) |
a334e125 | 64 | diffstat=--no-stat ;; |
d8abe148 | 65 | --stat|--summary) |
a334e125 | 66 | diffstat=--stat ;; |
efb779f8 SG |
67 | --log|--no-log) |
68 | log_arg=$1 ;; | |
123ee3ca JH |
69 | --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) |
70 | no_commit=--no-commit ;; | |
5072a323 LH |
71 | --c|--co|--com|--comm|--commi|--commit) |
72 | no_commit=--commit ;; | |
85808300 LT |
73 | -e|--edit) |
74 | edit=--edit ;; | |
75 | --no-edit) | |
76 | edit=--no-edit ;; | |
7d0c6887 JH |
77 | --sq|--squ|--squa|--squas|--squash) |
78 | squash=--squash ;; | |
5072a323 LH |
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 ;; | |
13474835 BG |
85 | --ff-only) |
86 | ff_only=--ff-only ;; | |
60fb5b2c JH |
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 | *,*=*) | |
8096fae7 | 92 | strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;; |
60fb5b2c JH |
93 | 1,*) |
94 | usage ;; | |
95 | *) | |
96 | strategy="$2" | |
97 | shift ;; | |
98 | esac | |
99 | strategy_args="${strategy_args}-s $strategy " | |
100 | ;; | |
ee2c7955 AP |
101 | -X*) |
102 | case "$#,$1" in | |
103 | 1,-X) | |
104 | usage ;; | |
105 | *,-X) | |
14e5d40c | 106 | xx="-X $(git rev-parse --sq-quote "$2")" |
ee2c7955 AP |
107 | shift ;; |
108 | *,*) | |
14e5d40c | 109 | xx=$(git rev-parse --sq-quote "$1") ;; |
ee2c7955 AP |
110 | esac |
111 | merge_args="$merge_args$xx " | |
112 | ;; | |
cd67e4d4 JS |
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 | ;; | |
7dce19d3 JL |
119 | --recurse-submodules) |
120 | recurse_submodules=--recurse-submodules | |
121 | ;; | |
8f0700dd JL |
122 | --recurse-submodules=*) |
123 | recurse_submodules="$1" | |
124 | ;; | |
be254a0e JL |
125 | --no-recurse-submodules) |
126 | recurse_submodules=--no-recurse-submodules | |
127 | ;; | |
29609e68 JK |
128 | --d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run) |
129 | dry_run=--dry-run | |
130 | ;; | |
87182b17 | 131 | -h|--help-all) |
93d69d86 JL |
132 | usage |
133 | ;; | |
822f7c73 DK |
134 | *) |
135 | # Pass thru anything that may be meant for fetch. | |
619e5a0e | 136 | break |
60fb5b2c JH |
137 | ;; |
138 | esac | |
139 | shift | |
140 | done | |
141 | ||
441ed413 JH |
142 | error_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 | ||
995fc2f7 JK |
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 | ||
441ed413 | 163 | curr_branch=${curr_branch#refs/heads/} |
a6dbf881 | 164 | upstream=$(git config "branch.$curr_branch.merge") |
a8c9bef4 | 165 | remote=$(git config "branch.$curr_branch.remote") |
441ed413 | 166 | |
a8c9bef4 | 167 | if [ $# -gt 1 ]; then |
995fc2f7 JK |
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." | |
a8c9bef4 JK |
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" | |
995fc2f7 | 178 | echo "a branch. Because this is not the default configured remote" |
a8c9bef4 | 179 | echo "for your current branch, you must specify a branch on the command line." |
15a147e6 MZ |
180 | elif [ -z "$curr_branch" -o -z "$upstream" ]; then |
181 | . git-parse-remote | |
182 | error_on_missing_default_upstream "pull" $op_type $op_prep \ | |
3c02396a | 183 | "git pull <remote> <branch>" |
a6dbf881 | 184 | else |
995fc2f7 JK |
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." | |
61e6108d | 187 | fi |
441ed413 JH |
188 | exit 1 |
189 | } | |
190 | ||
c85c7927 | 191 | test true = "$rebase" && { |
19a7fcbf JK |
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 | |
85af5f82 | 197 | die "$(gettext "updating an unborn branch with changes added to the index")" |
19a7fcbf JK |
198 | fi |
199 | else | |
92c62a3f | 200 | require_clean_work_tree "pull with rebase" "Please commit or stash them." |
19a7fcbf | 201 | fi |
d44e7126 | 202 | oldremoteref= && |
c85c7927 | 203 | . git-parse-remote && |
d44e7126 SB |
204 | remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" && |
205 | oldremoteref="$(git rev-parse -q --verify "$remoteref")" && | |
206 | for reflog in $(git rev-list -g $remoteref 2>/dev/null) | |
207 | do | |
208 | if test "$reflog" = "$(git merge-base $reflog $curr_branch)" | |
209 | then | |
210 | oldremoteref="$reflog" | |
211 | break | |
212 | fi | |
213 | done | |
c85c7927 | 214 | } |
2d179857 | 215 | orig_head=$(git rev-parse -q --verify HEAD) |
7dce19d3 | 216 | git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" || exit 1 |
29609e68 | 217 | test -z "$dry_run" || exit 0 |
b10ac50f | 218 | |
2d179857 | 219 | curr_head=$(git rev-parse -q --verify HEAD) |
b0ad11ea | 220 | if test -n "$orig_head" && test "$curr_head" != "$orig_head" |
b10ac50f JH |
221 | then |
222 | # The fetch involved updating the current branch. | |
223 | ||
224 | # The working tree and the index file is still based on the | |
225 | # $orig_head commit, but we are merging into $curr_head. | |
226 | # First update the working tree to match $curr_head. | |
227 | ||
c2b1a95c | 228 | eval_gettextln "Warning: fetch updated the current branch head. |
3320a973 | 229 | Warning: fast-forwarding your working tree from |
c2b1a95c | 230 | Warning: commit \$orig_head." >&2 |
7bd93c1c | 231 | git update-index -q --refresh |
5be60078 | 232 | git read-tree -u -m "$orig_head" "$curr_head" || |
9f35aaa9 | 233 | die "$(eval_gettext "Cannot fast-forward your working tree. |
8323124a | 234 | After making sure that you saved anything precious from |
9f35aaa9 | 235 | $ git diff \$orig_head |
8323124a JH |
236 | output, run |
237 | $ git reset --hard | |
9f35aaa9 | 238 | to recover.")" |
8323124a | 239 | |
b10ac50f JH |
240 | fi |
241 | ||
05dd8e2e JH |
242 | merge_head=$(sed -e '/ not-for-merge /d' \ |
243 | -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | \ | |
244 | tr '\012' ' ') | |
e0bfc81e JH |
245 | |
246 | case "$merge_head" in | |
521003ff | 247 | '') |
4973aa22 | 248 | error_on_no_merge_candidates "$@" |
521003ff | 249 | ;; |
60fb5b2c | 250 | ?*' '?*) |
d09e79cb LT |
251 | if test -z "$orig_head" |
252 | then | |
85af5f82 | 253 | die "$(gettext "Cannot merge multiple branches into empty head")" |
d09e79cb | 254 | fi |
51b2ead0 JS |
255 | if test true = "$rebase" |
256 | then | |
85af5f82 | 257 | die "$(gettext "Cannot rebase onto multiple branches")" |
51b2ead0 | 258 | fi |
60fb5b2c JH |
259 | ;; |
260 | esac | |
261 | ||
d09e79cb LT |
262 | if test -z "$orig_head" |
263 | then | |
b0ad11ea | 264 | git update-ref -m "initial pull" HEAD $merge_head "$curr_head" && |
4b3ffe51 | 265 | git read-tree -m -u HEAD || exit 1 |
d09e79cb LT |
266 | exit |
267 | fi | |
268 | ||
cf65426d EN |
269 | if test true = "$rebase" |
270 | then | |
271 | o=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref) | |
272 | if test "$oldremoteref" = "$o" | |
273 | then | |
274 | unset oldremoteref | |
275 | fi | |
276 | fi | |
277 | ||
efb779f8 | 278 | merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit |
14e5d40c JH |
279 | case "$rebase" in |
280 | true) | |
281 | eval="git-rebase $diffstat $strategy_args $merge_args" | |
282 | eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}" | |
283 | ;; | |
284 | *) | |
85808300 | 285 | eval="git-merge $diffstat $no_commit $edit $squash $no_ff $ff_only" |
bebd2fd7 JK |
286 | eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress" |
287 | eval="$eval \"\$merge_name\" HEAD $merge_head" | |
14e5d40c JH |
288 | ;; |
289 | esac | |
290 | eval "exec $eval" |