]>
Commit | Line | Data |
---|---|---|
7ef76925 LT |
1 | #!/bin/sh |
2 | # | |
87358b7a FK |
3 | |
4 | USAGE='<fetch-options> <repository> <refspec>...' | |
4da90285 | 5 | SUBDIRECTORY_OK=Yes |
ae2b0f15 | 6 | . git-sh-setup |
f9474132 | 7 | set_reflog_action "fetch $*" |
514c09fd | 8 | cd_to_toplevel ;# probably unnecessary... |
f9474132 | 9 | |
215a7ad1 | 10 | . git-parse-remote |
853a3697 JH |
11 | _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' |
12 | _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" | |
13 | ||
221e743c JH |
14 | LF=' |
15 | ' | |
16 | IFS="$LF" | |
17 | ||
03febf99 | 18 | no_tags= |
ed1aadf1 | 19 | tags= |
853a3697 | 20 | append= |
ae2da406 | 21 | force= |
583122cd | 22 | verbose= |
b10ac50f | 23 | update_head_ok= |
2c620a1a | 24 | exec= |
920ccbfc | 25 | keep= |
f53514bc | 26 | shallow_depth= |
ae2da406 JH |
27 | while case "$#" in 0) break ;; esac |
28 | do | |
29 | case "$1" in | |
30 | -a|--a|--ap|--app|--appe|--appen|--append) | |
31 | append=t | |
ae2da406 | 32 | ;; |
2796a9de JH |
33 | --upl|--uplo|--uploa|--upload|--upload-|--upload-p|\ |
34 | --upload-pa|--upload-pac|--upload-pack) | |
2c620a1a | 35 | shift |
ae1dffcb JH |
36 | exec="--upload-pack=$1" |
37 | ;; | |
38 | --upl=*|--uplo=*|--uploa=*|--upload=*|\ | |
39 | --upload-=*|--upload-p=*|--upload-pa=*|--upload-pac=*|--upload-pack=*) | |
40 | exec=--upload-pack=$(expr "$1" : '-[^=]*=\(.*\)') | |
41 | shift | |
2c620a1a | 42 | ;; |
ae2da406 JH |
43 | -f|--f|--fo|--for|--forc|--force) |
44 | force=t | |
b10ac50f | 45 | ;; |
ed1aadf1 LT |
46 | -t|--t|--ta|--tag|--tags) |
47 | tags=t | |
48 | ;; | |
03febf99 JH |
49 | -n|--n|--no|--no-|--no-t|--no-ta|--no-tag|--no-tags) |
50 | no_tags=t | |
51 | ;; | |
b10ac50f JH |
52 | -u|--u|--up|--upd|--upda|--updat|--update|--update-|--update-h|\ |
53 | --update-he|--update-hea|--update-head|--update-head-|\ | |
54 | --update-head-o|--update-head-ok) | |
55 | update_head_ok=t | |
ae2da406 | 56 | ;; |
583122cd LT |
57 | -v|--verbose) |
58 | verbose=Yes | |
59 | ;; | |
0f76f526 | 60 | -k|--k|--ke|--kee|--keep) |
576162a4 | 61 | keep='-k -k' |
0f76f526 | 62 | ;; |
f53514bc JS |
63 | --depth=*) |
64 | shallow_depth="--depth=`expr "z$1" : 'z-[^=]*=\(.*\)'`" | |
65 | ;; | |
66 | --depth) | |
67 | shift | |
68 | shallow_depth="--depth=$1" | |
69 | ;; | |
87358b7a FK |
70 | -*) |
71 | usage | |
72 | ;; | |
ae2da406 JH |
73 | *) |
74 | break | |
75 | ;; | |
76 | esac | |
b10ac50f | 77 | shift |
ae2da406 JH |
78 | done |
79 | ||
853a3697 JH |
80 | case "$#" in |
81 | 0) | |
648ad18f SB |
82 | origin=$(get_default_remote) |
83 | test -n "$(get_remote_url ${origin})" || | |
84 | die "Where do you want to fetch from today?" | |
85 | set x $origin ; shift ;; | |
853a3697 | 86 | esac |
ae2da406 | 87 | |
5dee29ac UKK |
88 | if test -z "$exec" |
89 | then | |
90 | # No command line override and we have configuration for the remote. | |
91 | exec="--upload-pack=$(get_uploadpack $1)" | |
92 | fi | |
93 | ||
853a3697 JH |
94 | remote_nick="$1" |
95 | remote=$(get_remote_url "$@") | |
96 | refs= | |
97 | rref= | |
98 | rsync_slurped_objects= | |
99 | ||
100 | if test "" = "$append" | |
101 | then | |
df34297a | 102 | : >"$GIT_DIR/FETCH_HEAD" |
853a3697 JH |
103 | fi |
104 | ||
28b8e61f | 105 | # Global that is reused later |
ae1dffcb | 106 | ls_remote_result=$(git ls-remote $exec "$remote") || |
b3d98993 | 107 | die "Cannot get the repository state from $remote" |
28b8e61f | 108 | |
853a3697 JH |
109 | append_fetch_head () { |
110 | head_="$1" | |
111 | remote_="$2" | |
112 | remote_name_="$3" | |
113 | remote_nick_="$4" | |
114 | local_name_="$5" | |
05dd8e2e JH |
115 | case "$6" in |
116 | t) not_for_merge_='not-for-merge' ;; | |
117 | '') not_for_merge_= ;; | |
118 | esac | |
853a3697 | 119 | |
06ec2b4b JH |
120 | # remote-nick is the URL given on the command line (or a shorthand) |
121 | # remote-name is the $GIT_DIR relative refs/ path we computed | |
122 | # for this refspec. | |
687b8be8 EW |
123 | |
124 | # the $note_ variable will be fed to git-fmt-merge-msg for further | |
125 | # processing. | |
06ec2b4b JH |
126 | case "$remote_name_" in |
127 | HEAD) | |
128 | note_= ;; | |
129 | refs/heads/*) | |
130 | note_="$(expr "$remote_name_" : 'refs/heads/\(.*\)')" | |
b91fb518 | 131 | note_="branch '$note_' of " ;; |
06ec2b4b JH |
132 | refs/tags/*) |
133 | note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')" | |
b91fb518 | 134 | note_="tag '$note_' of " ;; |
687b8be8 EW |
135 | refs/remotes/*) |
136 | note_="$(expr "$remote_name_" : 'refs/remotes/\(.*\)')" | |
137 | note_="remote branch '$note_' of " ;; | |
06ec2b4b | 138 | *) |
b91fb518 | 139 | note_="$remote_name of " ;; |
06ec2b4b | 140 | esac |
f327dbce | 141 | remote_1_=$(expr "z$remote_" : 'z\(.*\)\.git/*$') && |
b91fb518 JH |
142 | remote_="$remote_1_" |
143 | note_="$note_$remote_" | |
06ec2b4b | 144 | |
853a3697 JH |
145 | # 2.6.11-tree tag would not be happy to be fed to resolve. |
146 | if git-cat-file commit "$head_" >/dev/null 2>&1 | |
147 | then | |
8572aa85 | 148 | headc_=$(git-rev-parse --verify "$head_^0") || exit |
df34297a | 149 | echo "$headc_ $not_for_merge_ $note_" >>"$GIT_DIR/FETCH_HEAD" |
853a3697 | 150 | else |
df34297a | 151 | echo "$head_ not-for-merge $note_" >>"$GIT_DIR/FETCH_HEAD" |
853a3697 | 152 | fi |
20a3847d SB |
153 | |
154 | update_local_ref "$local_name_" "$head_" "$note_" | |
853a3697 JH |
155 | } |
156 | ||
20a3847d SB |
157 | update_local_ref () { |
158 | # If we are storing the head locally make sure that it is | |
159 | # a fast forward (aka "reverse push"). | |
160 | ||
161 | label_=$(git-cat-file -t $2) | |
162 | newshort_=$(git-rev-parse --short $2) | |
163 | if test -z "$1" ; then | |
164 | [ "$verbose" ] && echo >&2 "* fetched $3" | |
165 | [ "$verbose" ] && echo >&2 " $label_: $newshort_" | |
166 | return 0 | |
167 | fi | |
fbc72799 JH |
168 | oldshort_=$(git show-ref --hash --abbrev "$1" 2>/dev/null) |
169 | ||
853a3697 JH |
170 | case "$1" in |
171 | refs/tags/*) | |
172 | # Tags need not be pointing at commits so there | |
173 | # is no way to guarantee "fast-forward" anyway. | |
fbc72799 | 174 | if test -n "$oldshort_" |
ae2da406 | 175 | then |
fbc72799 | 176 | if now_=$(git show-ref --hash "$1") && test "$now_" = "$2" |
f8765797 | 177 | then |
20a3847d SB |
178 | [ "$verbose" ] && echo >&2 "* $1: same as $3" |
179 | [ "$verbose" ] && echo >&2 " $label_: $newshort_" ||: | |
f8765797 JH |
180 | else |
181 | echo >&2 "* $1: updating with $3" | |
20a3847d | 182 | echo >&2 " $label_: $newshort_" |
f9474132 | 183 | git-update-ref -m "$GIT_REFLOG_ACTION: updating tag" "$1" "$2" |
f8765797 | 184 | fi |
ae2da406 | 185 | else |
06ec2b4b | 186 | echo >&2 "* $1: storing $3" |
20a3847d | 187 | echo >&2 " $label_: $newshort_" |
f9474132 | 188 | git-update-ref -m "$GIT_REFLOG_ACTION: storing tag" "$1" "$2" |
ae2da406 | 189 | fi |
bf7960eb | 190 | ;; |
ae2da406 | 191 | |
687b8be8 | 192 | refs/heads/* | refs/remotes/*) |
bf7960eb JH |
193 | # $1 is the ref being updated. |
194 | # $2 is the new value for the ref. | |
195 | local=$(git-rev-parse --verify "$1^0" 2>/dev/null) | |
196 | if test "$local" | |
33b83034 | 197 | then |
bf7960eb | 198 | # Require fast-forward. |
853a3697 JH |
199 | mb=$(git-merge-base "$local" "$2") && |
200 | case "$2,$mb" in | |
201 | $local,*) | |
ea5aeb07 JH |
202 | if test -n "$verbose" |
203 | then | |
204 | echo >&2 "* $1: same as $3" | |
20a3847d | 205 | echo >&2 " $label_: $newshort_" |
ea5aeb07 | 206 | fi |
853a3697 JH |
207 | ;; |
208 | *,$local) | |
06ec2b4b | 209 | echo >&2 "* $1: fast forward to $3" |
20a3847d | 210 | echo >&2 " old..new: $oldshort_..$newshort_" |
f9474132 | 211 | git-update-ref -m "$GIT_REFLOG_ACTION: fast-forward" "$1" "$2" "$local" |
853a3697 JH |
212 | ;; |
213 | *) | |
214 | false | |
215 | ;; | |
216 | esac || { | |
bf7960eb JH |
217 | case ",$force,$single_force," in |
218 | *,t,*) | |
20a3847d SB |
219 | echo >&2 "* $1: forcing update to non-fast forward $3" |
220 | echo >&2 " old...new: $oldshort_...$newshort_" | |
f9474132 | 221 | git-update-ref -m "$GIT_REFLOG_ACTION: forced-update" "$1" "$2" "$local" |
ae2da406 JH |
222 | ;; |
223 | *) | |
20a3847d SB |
224 | echo >&2 "* $1: not updating to non-fast forward $3" |
225 | echo >&2 " old...new: $oldshort_...$newshort_" | |
a9698bb2 | 226 | exit 1 |
ae2da406 JH |
227 | ;; |
228 | esac | |
853a3697 JH |
229 | } |
230 | else | |
bf7960eb | 231 | echo >&2 "* $1: storing $3" |
20a3847d | 232 | echo >&2 " $label_: $newshort_" |
f9474132 | 233 | git-update-ref -m "$GIT_REFLOG_ACTION: storing head" "$1" "$2" |
33b83034 | 234 | fi |
0a623e7c | 235 | ;; |
853a3697 JH |
236 | esac |
237 | } | |
238 | ||
4b441f47 JH |
239 | # updating the current HEAD with git-fetch in a bare |
240 | # repository is always fine. | |
241 | if test -z "$update_head_ok" && test $(is_bare_repository) = false | |
242 | then | |
bf7960eb | 243 | orig_head=$(git-rev-parse --verify HEAD 2>/dev/null) |
4b441f47 | 244 | fi |
b10ac50f | 245 | |
ed1aadf1 LT |
246 | # If --tags (and later --heads or --all) is specified, then we are |
247 | # not talking about defaults stored in Pull: line of remotes or | |
248 | # branches file, and just fetch those and refspecs explicitly given. | |
249 | # Otherwise we do what we always did. | |
250 | ||
251 | reflist=$(get_remote_refs_for_fetch "$@") | |
252 | if test "$tags" | |
253 | then | |
ed9f7c95 | 254 | taglist=`IFS=' ' && |
28b8e61f | 255 | echo "$ls_remote_result" | |
81214e4d JH |
256 | while read sha1 name |
257 | do | |
57a39690 JH |
258 | case "$sha1" in |
259 | fail) | |
260 | exit 1 | |
261 | esac | |
81214e4d | 262 | case "$name" in |
878ccb26 | 263 | *^*) continue ;; |
28b8e61f JH |
264 | refs/tags/*) ;; |
265 | *) continue ;; | |
81214e4d JH |
266 | esac |
267 | if git-check-ref-format "$name" | |
268 | then | |
269 | echo ".${name}:${name}" | |
270 | else | |
271 | echo >&2 "warning: tag ${name} ignored" | |
272 | fi | |
57a39690 | 273 | done` || exit |
ed1aadf1 LT |
274 | if test "$#" -gt 1 |
275 | then | |
276 | # remote URL plus explicit refspecs; we need to merge them. | |
221e743c | 277 | reflist="$reflist$LF$taglist" |
ed1aadf1 LT |
278 | else |
279 | # No explicit refspecs; fetch tags only. | |
280 | reflist=$taglist | |
281 | fi | |
282 | fi | |
283 | ||
03febf99 JH |
284 | fetch_main () { |
285 | reflist="$1" | |
286 | refs= | |
4839bd8a | 287 | rref= |
f170e4b3 | 288 | |
03febf99 JH |
289 | for ref in $reflist |
290 | do | |
291 | refs="$refs$LF$ref" | |
f170e4b3 | 292 | |
03febf99 JH |
293 | # These are relative path from $GIT_DIR, typically starting at refs/ |
294 | # but may be HEAD | |
f327dbce | 295 | if expr "z$ref" : 'z\.' >/dev/null |
03febf99 JH |
296 | then |
297 | not_for_merge=t | |
f327dbce | 298 | ref=$(expr "z$ref" : 'z\.\(.*\)') |
03febf99 JH |
299 | else |
300 | not_for_merge= | |
301 | fi | |
dfdcb558 | 302 | if expr "z$ref" : 'z+' >/dev/null |
03febf99 JH |
303 | then |
304 | single_force=t | |
dfdcb558 | 305 | ref=$(expr "z$ref" : 'z+\(.*\)') |
03febf99 JH |
306 | else |
307 | single_force= | |
308 | fi | |
f327dbce MW |
309 | remote_name=$(expr "z$ref" : 'z\([^:]*\):') |
310 | local_name=$(expr "z$ref" : 'z[^:]*:\(.*\)') | |
853a3697 | 311 | |
03febf99 | 312 | rref="$rref$LF$remote_name" |
4447badc | 313 | |
03febf99 JH |
314 | # There are transports that can fetch only one head at a time... |
315 | case "$remote" in | |
38529e28 | 316 | http://* | https://* | ftp://*) |
f53514bc JS |
317 | test -n "$shallow_depth" && |
318 | die "shallow clone with http not supported" | |
ddaf7314 | 319 | proto=`expr "$remote" : '\([^:]*\):'` |
03febf99 JH |
320 | if [ -n "$GIT_SSL_NO_VERIFY" ]; then |
321 | curl_extra_args="-k" | |
322 | fi | |
3ea099d4 SK |
323 | if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \ |
324 | "`git-repo-config --bool http.noEPSV`" = true ]; then | |
325 | noepsv_opt="--disable-epsv" | |
326 | fi | |
2986c022 JH |
327 | |
328 | # Find $remote_name from ls-remote output. | |
329 | head=$( | |
330 | IFS=' ' | |
331 | echo "$ls_remote_result" | | |
332 | while read sha1 name | |
333 | do | |
334 | test "z$name" = "z$remote_name" || continue | |
335 | echo "$sha1" | |
336 | break | |
337 | done | |
338 | ) | |
f327dbce | 339 | expr "z$head" : "z$_x40\$" >/dev/null || |
2986c022 | 340 | die "No such ref $remote_name at $remote" |
ddaf7314 | 341 | echo >&2 "Fetching $remote_name from $remote using $proto" |
03febf99 JH |
342 | git-http-fetch -v -a "$head" "$remote/" || exit |
343 | ;; | |
344 | rsync://*) | |
f53514bc JS |
345 | test -n "$shallow_depth" && |
346 | die "shallow clone with rsync not supported" | |
03febf99 JH |
347 | TMP_HEAD="$GIT_DIR/TMP_HEAD" |
348 | rsync -L -q "$remote/$remote_name" "$TMP_HEAD" || exit 1 | |
349 | head=$(git-rev-parse --verify TMP_HEAD) | |
350 | rm -f "$TMP_HEAD" | |
351 | test "$rsync_slurped_objects" || { | |
352 | rsync -av --ignore-existing --exclude info \ | |
353 | "$remote/objects/" "$GIT_OBJECT_DIRECTORY/" || exit | |
853a3697 | 354 | |
03febf99 JH |
355 | # Look at objects/info/alternates for rsync -- http will |
356 | # support it natively and git native ones will do it on | |
357 | # the remote end. Not having that file is not a crime. | |
358 | rsync -q "$remote/objects/info/alternates" \ | |
359 | "$GIT_DIR/TMP_ALT" 2>/dev/null || | |
360 | rm -f "$GIT_DIR/TMP_ALT" | |
361 | if test -f "$GIT_DIR/TMP_ALT" | |
362 | then | |
363 | resolve_alternates "$remote" <"$GIT_DIR/TMP_ALT" | | |
364 | while read alt | |
365 | do | |
366 | case "$alt" in 'bad alternate: '*) die "$alt";; esac | |
367 | echo >&2 "Getting alternate: $alt" | |
368 | rsync -av --ignore-existing --exclude info \ | |
369 | "$alt" "$GIT_OBJECT_DIRECTORY/" || exit | |
370 | done | |
371 | rm -f "$GIT_DIR/TMP_ALT" | |
372 | fi | |
373 | rsync_slurped_objects=t | |
374 | } | |
375 | ;; | |
376 | *) | |
377 | # We will do git native transport with just one call later. | |
378 | continue ;; | |
379 | esac | |
f170e4b3 | 380 | |
03febf99 | 381 | append_fetch_head "$head" "$remote" \ |
f64d7fd2 | 382 | "$remote_name" "$remote_nick" "$local_name" "$not_for_merge" || exit |
853a3697 | 383 | |
03febf99 JH |
384 | done |
385 | ||
386 | case "$remote" in | |
38529e28 | 387 | http://* | https://* | ftp://* | rsync://* ) |
03febf99 JH |
388 | ;; # we are already done. |
389 | *) | |
390 | ( : subshell because we muck with IFS | |
391 | IFS=" $LF" | |
392 | ( | |
ac9c1108 JH |
393 | git-fetch-pack --thin $exec $keep $shallow_depth "$remote" $rref || |
394 | echo failed "$remote" | |
03febf99 | 395 | ) | |
ac9c1108 JH |
396 | ( |
397 | trap ' | |
398 | if test -n "$keepfile" && test -f "$keepfile" | |
399 | then | |
400 | rm -f "$keepfile" | |
401 | fi | |
402 | ' 0 | |
403 | ||
404 | keepfile= | |
405 | while read sha1 remote_name | |
406 | do | |
03febf99 JH |
407 | case "$sha1" in |
408 | failed) | |
409 | echo >&2 "Fetch failure: $remote" | |
410 | exit 1 ;; | |
576162a4 NP |
411 | # special line coming from index-pack with the pack name |
412 | pack) | |
413 | continue ;; | |
414 | keep) | |
ac9c1108 | 415 | keepfile="$GIT_OBJECT_DIRECTORY/pack/pack-$remote_name.keep" |
576162a4 | 416 | continue ;; |
03febf99 JH |
417 | esac |
418 | found= | |
419 | single_force= | |
420 | for ref in $refs | |
421 | do | |
422 | case "$ref" in | |
423 | +$remote_name:*) | |
424 | single_force=t | |
425 | not_for_merge= | |
426 | found="$ref" | |
427 | break ;; | |
428 | .+$remote_name:*) | |
429 | single_force=t | |
430 | not_for_merge=t | |
431 | found="$ref" | |
432 | break ;; | |
433 | .$remote_name:*) | |
434 | not_for_merge=t | |
435 | found="$ref" | |
436 | break ;; | |
437 | $remote_name:*) | |
438 | not_for_merge= | |
439 | found="$ref" | |
440 | break ;; | |
441 | esac | |
442 | done | |
f327dbce | 443 | local_name=$(expr "z$found" : 'z[^:]*:\(.*\)') |
03febf99 | 444 | append_fetch_head "$sha1" "$remote" \ |
f64d7fd2 JH |
445 | "$remote_name" "$remote_nick" "$local_name" \ |
446 | "$not_for_merge" || exit | |
ac9c1108 JH |
447 | done |
448 | ) | |
03febf99 JH |
449 | ) || exit ;; |
450 | esac | |
451 | ||
452 | } | |
453 | ||
f64d7fd2 | 454 | fetch_main "$reflist" || exit |
03febf99 JH |
455 | |
456 | # automated tag following | |
457 | case "$no_tags$tags" in | |
458 | '') | |
6dc78e69 JH |
459 | case "$reflist" in |
460 | *:refs/*) | |
461 | # effective only when we are following remote branch | |
462 | # using local tracking branch. | |
ed9f7c95 | 463 | taglist=$(IFS=' ' && |
28b8e61f | 464 | echo "$ls_remote_result" | |
ed9f7c95 | 465 | git-show-ref --exclude-existing=refs/tags/ | |
6dc78e69 JH |
466 | while read sha1 name |
467 | do | |
6dc78e69 JH |
468 | git-cat-file -t "$sha1" >/dev/null 2>&1 || continue |
469 | echo >&2 "Auto-following $name" | |
470 | echo ".${name}:${name}" | |
471 | done) | |
472 | esac | |
03febf99 JH |
473 | case "$taglist" in |
474 | '') ;; | |
475 | ?*) | |
d1586315 AJ |
476 | # do not deepen a shallow tree when following tags |
477 | shallow_depth= | |
f64d7fd2 | 478 | fetch_main "$taglist" || exit ;; |
03febf99 | 479 | esac |
853a3697 | 480 | esac |
b10ac50f JH |
481 | |
482 | # If the original head was empty (i.e. no "master" yet), or | |
483 | # if we were told not to worry, we do not have to check. | |
9861718b JH |
484 | case "$orig_head" in |
485 | '') | |
b10ac50f | 486 | ;; |
9861718b | 487 | ?*) |
bf7960eb | 488 | curr_head=$(git-rev-parse --verify HEAD 2>/dev/null) |
b10ac50f JH |
489 | if test "$curr_head" != "$orig_head" |
490 | then | |
55b7835e | 491 | git-update-ref \ |
f9474132 | 492 | -m "$GIT_REFLOG_ACTION: Undoing incorrectly fetched HEAD." \ |
55b7835e | 493 | HEAD "$orig_head" |
b10ac50f JH |
494 | die "Cannot fetch into the current branch." |
495 | fi | |
496 | ;; | |
497 | esac |