]>
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 | ||
ed1aadf1 | 14 | tags= |
853a3697 | 15 | append= |
ae2da406 | 16 | force= |
583122cd | 17 | verbose= |
b10ac50f | 18 | update_head_ok= |
ae2da406 JH |
19 | while case "$#" in 0) break ;; esac |
20 | do | |
21 | case "$1" in | |
22 | -a|--a|--ap|--app|--appe|--appen|--append) | |
23 | append=t | |
ae2da406 JH |
24 | ;; |
25 | -f|--f|--fo|--for|--forc|--force) | |
26 | force=t | |
b10ac50f | 27 | ;; |
ed1aadf1 LT |
28 | -t|--t|--ta|--tag|--tags) |
29 | tags=t | |
30 | ;; | |
b10ac50f JH |
31 | -u|--u|--up|--upd|--upda|--updat|--update|--update-|--update-h|\ |
32 | --update-he|--update-hea|--update-head|--update-head-|\ | |
33 | --update-head-o|--update-head-ok) | |
34 | update_head_ok=t | |
ae2da406 | 35 | ;; |
583122cd LT |
36 | -v|--verbose) |
37 | verbose=Yes | |
38 | ;; | |
87358b7a FK |
39 | -*) |
40 | usage | |
41 | ;; | |
ae2da406 JH |
42 | *) |
43 | break | |
44 | ;; | |
45 | esac | |
b10ac50f | 46 | shift |
ae2da406 JH |
47 | done |
48 | ||
853a3697 JH |
49 | case "$#" in |
50 | 0) | |
92c533ef JH |
51 | test -f "$GIT_DIR/branches/origin" || |
52 | test -f "$GIT_DIR/remotes/origin" || | |
b10ac50f | 53 | die "Where do you want to fetch from today?" |
92c533ef | 54 | set origin ;; |
853a3697 | 55 | esac |
ae2da406 | 56 | |
853a3697 JH |
57 | remote_nick="$1" |
58 | remote=$(get_remote_url "$@") | |
59 | refs= | |
60 | rref= | |
61 | rsync_slurped_objects= | |
62 | ||
63 | if test "" = "$append" | |
64 | then | |
df34297a | 65 | : >"$GIT_DIR/FETCH_HEAD" |
853a3697 JH |
66 | fi |
67 | ||
68 | append_fetch_head () { | |
69 | head_="$1" | |
70 | remote_="$2" | |
71 | remote_name_="$3" | |
72 | remote_nick_="$4" | |
73 | local_name_="$5" | |
05dd8e2e JH |
74 | case "$6" in |
75 | t) not_for_merge_='not-for-merge' ;; | |
76 | '') not_for_merge_= ;; | |
77 | esac | |
853a3697 | 78 | |
06ec2b4b JH |
79 | # remote-nick is the URL given on the command line (or a shorthand) |
80 | # remote-name is the $GIT_DIR relative refs/ path we computed | |
81 | # for this refspec. | |
82 | case "$remote_name_" in | |
83 | HEAD) | |
84 | note_= ;; | |
85 | refs/heads/*) | |
86 | note_="$(expr "$remote_name_" : 'refs/heads/\(.*\)')" | |
b91fb518 | 87 | note_="branch '$note_' of " ;; |
06ec2b4b JH |
88 | refs/tags/*) |
89 | note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')" | |
b91fb518 | 90 | note_="tag '$note_' of " ;; |
06ec2b4b | 91 | *) |
b91fb518 | 92 | note_="$remote_name of " ;; |
06ec2b4b | 93 | esac |
b91fb518 JH |
94 | remote_1_=$(expr "$remote_" : '\(.*\)\.git/*$') && |
95 | remote_="$remote_1_" | |
96 | note_="$note_$remote_" | |
06ec2b4b | 97 | |
853a3697 JH |
98 | # 2.6.11-tree tag would not be happy to be fed to resolve. |
99 | if git-cat-file commit "$head_" >/dev/null 2>&1 | |
100 | then | |
8572aa85 | 101 | headc_=$(git-rev-parse --verify "$head_^0") || exit |
df34297a | 102 | echo "$headc_ $not_for_merge_ $note_" >>"$GIT_DIR/FETCH_HEAD" |
583122cd LT |
103 | [ "$verbose" ] && echo >&2 "* committish: $head_" |
104 | [ "$verbose" ] && echo >&2 " $note_" | |
853a3697 | 105 | else |
df34297a | 106 | echo "$head_ not-for-merge $note_" >>"$GIT_DIR/FETCH_HEAD" |
583122cd LT |
107 | [ "$verbose" ] && echo >&2 "* non-commit: $head_" |
108 | [ "$verbose" ] && echo >&2 " $note_" | |
853a3697 JH |
109 | fi |
110 | if test "$local_name_" != "" | |
111 | then | |
112 | # We are storing the head locally. Make sure that it is | |
113 | # a fast forward (aka "reverse push"). | |
06ec2b4b | 114 | fast_forward_local "$local_name_" "$head_" "$note_" |
853a3697 JH |
115 | fi |
116 | } | |
117 | ||
118 | fast_forward_local () { | |
866ff2f7 | 119 | mkdir -p "$(dirname "$GIT_DIR/$1")" |
853a3697 JH |
120 | case "$1" in |
121 | refs/tags/*) | |
122 | # Tags need not be pointing at commits so there | |
123 | # is no way to guarantee "fast-forward" anyway. | |
ae2da406 JH |
124 | if test -f "$GIT_DIR/$1" |
125 | then | |
f8765797 JH |
126 | if now_=$(cat "$GIT_DIR/$1") && test "$now_" = "$2" |
127 | then | |
583122cd | 128 | [ "$verbose" ] && echo >&2 "* $1: same as $3" |
f8765797 JH |
129 | else |
130 | echo >&2 "* $1: updating with $3" | |
131 | fi | |
ae2da406 | 132 | else |
06ec2b4b | 133 | echo >&2 "* $1: storing $3" |
ae2da406 | 134 | fi |
bf7960eb JH |
135 | git-update-ref "$1" "$2" |
136 | ;; | |
ae2da406 | 137 | |
853a3697 | 138 | refs/heads/*) |
bf7960eb JH |
139 | # $1 is the ref being updated. |
140 | # $2 is the new value for the ref. | |
141 | local=$(git-rev-parse --verify "$1^0" 2>/dev/null) | |
142 | if test "$local" | |
33b83034 | 143 | then |
bf7960eb | 144 | # Require fast-forward. |
853a3697 JH |
145 | mb=$(git-merge-base "$local" "$2") && |
146 | case "$2,$mb" in | |
147 | $local,*) | |
06ec2b4b | 148 | echo >&2 "* $1: same as $3" |
853a3697 JH |
149 | ;; |
150 | *,$local) | |
06ec2b4b | 151 | echo >&2 "* $1: fast forward to $3" |
bf7960eb | 152 | git-update-ref "$1" "$2" "$local" |
853a3697 JH |
153 | ;; |
154 | *) | |
155 | false | |
156 | ;; | |
157 | esac || { | |
06ec2b4b | 158 | echo >&2 "* $1: does not fast forward to $3;" |
bf7960eb JH |
159 | case ",$force,$single_force," in |
160 | *,t,*) | |
06ec2b4b | 161 | echo >&2 " forcing update." |
bf7960eb | 162 | git-update-ref "$1" "$2" "$local" |
ae2da406 JH |
163 | ;; |
164 | *) | |
bf7960eb | 165 | echo >&2 " not updating." |
ae2da406 JH |
166 | ;; |
167 | esac | |
853a3697 JH |
168 | } |
169 | else | |
bf7960eb JH |
170 | echo >&2 "* $1: storing $3" |
171 | git-update-ref "$1" "$2" | |
33b83034 | 172 | fi |
0a623e7c | 173 | ;; |
853a3697 JH |
174 | esac |
175 | } | |
176 | ||
b10ac50f JH |
177 | case "$update_head_ok" in |
178 | '') | |
bf7960eb | 179 | orig_head=$(git-rev-parse --verify HEAD 2>/dev/null) |
b10ac50f JH |
180 | ;; |
181 | esac | |
182 | ||
ed1aadf1 LT |
183 | # If --tags (and later --heads or --all) is specified, then we are |
184 | # not talking about defaults stored in Pull: line of remotes or | |
185 | # branches file, and just fetch those and refspecs explicitly given. | |
186 | # Otherwise we do what we always did. | |
187 | ||
188 | reflist=$(get_remote_refs_for_fetch "$@") | |
189 | if test "$tags" | |
190 | then | |
221e743c JH |
191 | taglist=$(git-ls-remote --tags "$remote" | |
192 | sed -e ' | |
cdb39508 | 193 | /\^/d |
221e743c | 194 | s/^[^ ]* // |
36cd2cc7 | 195 | s/.*/.&:&/') |
ed1aadf1 LT |
196 | if test "$#" -gt 1 |
197 | then | |
198 | # remote URL plus explicit refspecs; we need to merge them. | |
221e743c | 199 | reflist="$reflist$LF$taglist" |
ed1aadf1 LT |
200 | else |
201 | # No explicit refspecs; fetch tags only. | |
202 | reflist=$taglist | |
203 | fi | |
204 | fi | |
205 | ||
206 | for ref in $reflist | |
853a3697 | 207 | do |
221e743c | 208 | refs="$refs$LF$ref" |
f170e4b3 | 209 | |
853a3697 JH |
210 | # These are relative path from $GIT_DIR, typically starting at refs/ |
211 | # but may be HEAD | |
05dd8e2e JH |
212 | if expr "$ref" : '\.' >/dev/null |
213 | then | |
214 | not_for_merge=t | |
215 | ref=$(expr "$ref" : '\.\(.*\)') | |
216 | else | |
217 | not_for_merge= | |
218 | fi | |
efe9bf0f JH |
219 | if expr "$ref" : '\+' >/dev/null |
220 | then | |
221 | single_force=t | |
222 | ref=$(expr "$ref" : '\+\(.*\)') | |
223 | else | |
224 | single_force= | |
225 | fi | |
853a3697 JH |
226 | remote_name=$(expr "$ref" : '\([^:]*\):') |
227 | local_name=$(expr "$ref" : '[^:]*:\(.*\)') | |
f170e4b3 | 228 | |
221e743c | 229 | rref="$rref$LF$remote_name" |
853a3697 JH |
230 | |
231 | # There are transports that can fetch only one head at a time... | |
232 | case "$remote" in | |
233 | http://* | https://*) | |
234 | if [ -n "$GIT_SSL_NO_VERIFY" ]; then | |
235 | curl_extra_args="-k" | |
236 | fi | |
221e743c JH |
237 | remote_name_quoted=$(perl -e ' |
238 | my $u = $ARGV[0]; | |
239 | $u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg; | |
240 | print "$u"; | |
241 | ' "$remote_name") | |
66c9ec25 | 242 | head=$(curl -nsfL $curl_extra_args "$remote/$remote_name_quoted") && |
853a3697 | 243 | expr "$head" : "$_x40\$" >/dev/null || |
b10ac50f | 244 | die "Failed to fetch $remote_name from $remote" |
0b7a9fc9 | 245 | echo >&2 Fetching "$remote_name from $remote" using http |
215a7ad1 | 246 | git-http-fetch -v -a "$head" "$remote/" || exit |
60ea0fdd | 247 | ;; |
853a3697 JH |
248 | rsync://*) |
249 | TMP_HEAD="$GIT_DIR/TMP_HEAD" | |
4447badc | 250 | rsync -L -q "$remote/$remote_name" "$TMP_HEAD" || exit 1 |
bf7960eb | 251 | head=$(git-rev-parse --verify TMP_HEAD) |
853a3697 JH |
252 | rm -f "$TMP_HEAD" |
253 | test "$rsync_slurped_objects" || { | |
4447badc JH |
254 | rsync -av --ignore-existing --exclude info \ |
255 | "$remote/objects/" "$GIT_OBJECT_DIRECTORY/" || exit | |
256 | ||
257 | # Look at objects/info/alternates for rsync -- http will | |
258 | # support it natively and git native ones will do it on the remote | |
259 | # end. Not having that file is not a crime. | |
89d844d0 JH |
260 | rsync -q "$remote/objects/info/alternates" \ |
261 | "$GIT_DIR/TMP_ALT" 2>/dev/null || | |
262 | rm -f "$GIT_DIR/TMP_ALT" | |
4447badc JH |
263 | if test -f "$GIT_DIR/TMP_ALT" |
264 | then | |
265 | resolve_alternates "$remote" <"$GIT_DIR/TMP_ALT" | | |
266 | while read alt | |
267 | do | |
268 | case "$alt" in 'bad alternate: '*) die "$alt";; esac | |
269 | echo >&2 "Getting alternate: $alt" | |
270 | rsync -av --ignore-existing --exclude info \ | |
271 | "$alt" "$GIT_OBJECT_DIRECTORY/" || exit | |
272 | done | |
273 | rm -f "$GIT_DIR/TMP_ALT" | |
274 | fi | |
853a3697 JH |
275 | rsync_slurped_objects=t |
276 | } | |
277 | ;; | |
278 | *) | |
279 | # We will do git native transport with just one call later. | |
280 | continue ;; | |
281 | esac | |
282 | ||
05dd8e2e JH |
283 | append_fetch_head "$head" "$remote" \ |
284 | "$remote_name" "$remote_nick" "$local_name" "$not_for_merge" | |
f170e4b3 | 285 | |
853a3697 JH |
286 | done |
287 | ||
288 | case "$remote" in | |
289 | http://* | https://* | rsync://* ) | |
290 | ;; # we are already done. | |
291 | *) | |
221e743c | 292 | IFS=" $LF" |
22c67ca8 JH |
293 | ( |
294 | git-fetch-pack "$remote" $rref || echo failed "$remote" | |
295 | ) | | |
853a3697 JH |
296 | while read sha1 remote_name |
297 | do | |
22c67ca8 JH |
298 | case "$sha1" in |
299 | failed) | |
300 | echo >&2 "Fetch failure: $remote" | |
301 | exit 1 ;; | |
302 | esac | |
853a3697 | 303 | found= |
efe9bf0f | 304 | single_force= |
853a3697 JH |
305 | for ref in $refs |
306 | do | |
307 | case "$ref" in | |
efe9bf0f JH |
308 | +$remote_name:*) |
309 | single_force=t | |
05dd8e2e JH |
310 | not_for_merge= |
311 | found="$ref" | |
312 | break ;; | |
313 | .+$remote_name:*) | |
314 | single_force=t | |
315 | not_for_merge=t | |
316 | found="$ref" | |
317 | break ;; | |
318 | .$remote_name:*) | |
319 | not_for_merge=t | |
efe9bf0f JH |
320 | found="$ref" |
321 | break ;; | |
853a3697 | 322 | $remote_name:*) |
05dd8e2e | 323 | not_for_merge= |
853a3697 JH |
324 | found="$ref" |
325 | break ;; | |
326 | esac | |
327 | done | |
853a3697 | 328 | local_name=$(expr "$found" : '[^:]*:\(.*\)') |
05dd8e2e JH |
329 | append_fetch_head "$sha1" "$remote" \ |
330 | "$remote_name" "$remote_nick" "$local_name" "$not_for_merge" | |
22c67ca8 | 331 | done || exit |
853a3697 JH |
332 | ;; |
333 | esac | |
b10ac50f JH |
334 | |
335 | # If the original head was empty (i.e. no "master" yet), or | |
336 | # if we were told not to worry, we do not have to check. | |
337 | case ",$update_head_ok,$orig_head," in | |
338 | *,, | t,* ) | |
339 | ;; | |
340 | *) | |
bf7960eb | 341 | curr_head=$(git-rev-parse --verify HEAD 2>/dev/null) |
b10ac50f JH |
342 | if test "$curr_head" != "$orig_head" |
343 | then | |
bf7960eb | 344 | git-update-ref HEAD "$orig_head" |
b10ac50f JH |
345 | die "Cannot fetch into the current branch." |
346 | fi | |
347 | ;; | |
348 | esac |