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