blob: 83143f82cfa3b92a38a9caa2b00860541d139aa2 [file] [log] [blame]
Linus Torvalds7ef76922005-05-22 11:03:24 -07001#!/bin/sh
2#
freku045@student.liu.se87358b72005-12-13 23:30:31 +01003
4USAGE='<fetch-options> <repository> <refspec>...'
Junio C Hamanoae2b0f12005-11-24 00:12:11 -08005. git-sh-setup
Junio C Hamano215a7ad2005-09-07 17:26:23 -07006. git-parse-remote
Junio C Hamano853a3692005-08-20 02:54:34 -07007_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"
Linus Torvaldsb33e9662005-07-08 10:57:21 -07009
Junio C Hamano221e7432005-10-10 23:22:02 -070010LF='
11'
12IFS="$LF"
13
Junio C Hamano03febf92006-01-07 00:48:04 -080014no_tags=
Linus Torvaldsed1aadf2005-09-29 14:35:15 -070015tags=
Junio C Hamano853a3692005-08-20 02:54:34 -070016append=
Junio C Hamanoae2da402005-08-22 21:28:33 -070017force=
Linus Torvalds583122c2005-11-18 08:31:55 -080018verbose=
Junio C Hamanob10ac502005-08-25 18:15:32 -070019update_head_ok=
Michal Ostrowski2c620a12006-01-20 13:05:24 -050020exec=
Michal Ostrowski96b086d2006-01-20 13:38:16 -050021upload_pack=
Junio C Hamanoae2da402005-08-22 21:28:33 -070022while case "$#" in 0) break ;; esac
23do
24 case "$1" in
25 -a|--a|--ap|--app|--appe|--appen|--append)
26 append=t
Junio C Hamanoae2da402005-08-22 21:28:33 -070027 ;;
Junio C Hamano2796a9d2006-01-26 18:11:06 -080028 --upl|--uplo|--uploa|--upload|--upload-|--upload-p|\
29 --upload-pa|--upload-pac|--upload-pack)
Michal Ostrowski2c620a12006-01-20 13:05:24 -050030 shift
31 exec="--exec=$1"
Michal Ostrowski96b086d2006-01-20 13:38:16 -050032 upload_pack="-u $1"
Michal Ostrowski2c620a12006-01-20 13:05:24 -050033 ;;
Junio C Hamanoae2da402005-08-22 21:28:33 -070034 -f|--f|--fo|--for|--forc|--force)
35 force=t
Junio C Hamanob10ac502005-08-25 18:15:32 -070036 ;;
Linus Torvaldsed1aadf2005-09-29 14:35:15 -070037 -t|--t|--ta|--tag|--tags)
38 tags=t
39 ;;
Junio C Hamano03febf92006-01-07 00:48:04 -080040 -n|--n|--no|--no-|--no-t|--no-ta|--no-tag|--no-tags)
41 no_tags=t
42 ;;
Junio C Hamanob10ac502005-08-25 18:15:32 -070043 -u|--u|--up|--upd|--upda|--updat|--update|--update-|--update-h|\
44 --update-he|--update-hea|--update-head|--update-head-|\
45 --update-head-o|--update-head-ok)
46 update_head_ok=t
Junio C Hamanoae2da402005-08-22 21:28:33 -070047 ;;
Linus Torvalds583122c2005-11-18 08:31:55 -080048 -v|--verbose)
49 verbose=Yes
50 ;;
Tom Prince0f76f522006-01-10 18:50:19 -070051 -k|--k|--ke|--kee|--keep)
52 keep=--keep
53 ;;
freku045@student.liu.se87358b72005-12-13 23:30:31 +010054 -*)
55 usage
56 ;;
Junio C Hamanoae2da402005-08-22 21:28:33 -070057 *)
58 break
59 ;;
60 esac
Junio C Hamanob10ac502005-08-25 18:15:32 -070061 shift
Junio C Hamanoae2da402005-08-22 21:28:33 -070062done
63
Junio C Hamano853a3692005-08-20 02:54:34 -070064case "$#" in
650)
Junio C Hamano92c533e2005-08-20 03:00:03 -070066 test -f "$GIT_DIR/branches/origin" ||
67 test -f "$GIT_DIR/remotes/origin" ||
Junio C Hamanob10ac502005-08-25 18:15:32 -070068 die "Where do you want to fetch from today?"
Junio C Hamano92c533e2005-08-20 03:00:03 -070069 set origin ;;
Junio C Hamano853a3692005-08-20 02:54:34 -070070esac
Junio C Hamanoae2da402005-08-22 21:28:33 -070071
Junio C Hamano853a3692005-08-20 02:54:34 -070072remote_nick="$1"
73remote=$(get_remote_url "$@")
74refs=
75rref=
76rsync_slurped_objects=
Linus Torvalds7ef76922005-05-22 11:03:24 -070077
Junio C Hamano853a3692005-08-20 02:54:34 -070078if test "" = "$append"
79then
Santi_Béjardf342972005-10-05 18:58:10 +020080 : >"$GIT_DIR/FETCH_HEAD"
Junio C Hamano853a3692005-08-20 02:54:34 -070081fi
82
83append_fetch_head () {
84 head_="$1"
85 remote_="$2"
86 remote_name_="$3"
87 remote_nick_="$4"
88 local_name_="$5"
Junio C Hamano05dd8e22005-09-25 22:54:23 -070089 case "$6" in
90 t) not_for_merge_='not-for-merge' ;;
91 '') not_for_merge_= ;;
92 esac
Junio C Hamano853a3692005-08-20 02:54:34 -070093
Junio C Hamano06ec2b42005-09-02 02:34:13 -070094 # remote-nick is the URL given on the command line (or a shorthand)
95 # remote-name is the $GIT_DIR relative refs/ path we computed
96 # for this refspec.
Eric Wong687b8be2006-03-10 04:19:07 -080097
98 # the $note_ variable will be fed to git-fmt-merge-msg for further
99 # processing.
Junio C Hamano06ec2b42005-09-02 02:34:13 -0700100 case "$remote_name_" in
101 HEAD)
102 note_= ;;
103 refs/heads/*)
104 note_="$(expr "$remote_name_" : 'refs/heads/\(.*\)')"
Junio C Hamanob91fb512005-09-21 13:59:54 -0700105 note_="branch '$note_' of " ;;
Junio C Hamano06ec2b42005-09-02 02:34:13 -0700106 refs/tags/*)
107 note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')"
Junio C Hamanob91fb512005-09-21 13:59:54 -0700108 note_="tag '$note_' of " ;;
Eric Wong687b8be2006-03-10 04:19:07 -0800109 refs/remotes/*)
110 note_="$(expr "$remote_name_" : 'refs/remotes/\(.*\)')"
111 note_="remote branch '$note_' of " ;;
Junio C Hamano06ec2b42005-09-02 02:34:13 -0700112 *)
Junio C Hamanob91fb512005-09-21 13:59:54 -0700113 note_="$remote_name of " ;;
Junio C Hamano06ec2b42005-09-02 02:34:13 -0700114 esac
Mark Woodingf327dbc2006-04-13 22:01:24 +0000115 remote_1_=$(expr "z$remote_" : 'z\(.*\)\.git/*$') &&
Junio C Hamanob91fb512005-09-21 13:59:54 -0700116 remote_="$remote_1_"
117 note_="$note_$remote_"
Junio C Hamano06ec2b42005-09-02 02:34:13 -0700118
Junio C Hamano853a3692005-08-20 02:54:34 -0700119 # 2.6.11-tree tag would not be happy to be fed to resolve.
120 if git-cat-file commit "$head_" >/dev/null 2>&1
121 then
Junio C Hamano8572aa82005-08-24 22:46:07 -0700122 headc_=$(git-rev-parse --verify "$head_^0") || exit
Santi_Béjardf342972005-10-05 18:58:10 +0200123 echo "$headc_ $not_for_merge_ $note_" >>"$GIT_DIR/FETCH_HEAD"
Linus Torvalds583122c2005-11-18 08:31:55 -0800124 [ "$verbose" ] && echo >&2 "* committish: $head_"
125 [ "$verbose" ] && echo >&2 " $note_"
Junio C Hamano853a3692005-08-20 02:54:34 -0700126 else
Santi_Béjardf342972005-10-05 18:58:10 +0200127 echo "$head_ not-for-merge $note_" >>"$GIT_DIR/FETCH_HEAD"
Linus Torvalds583122c2005-11-18 08:31:55 -0800128 [ "$verbose" ] && echo >&2 "* non-commit: $head_"
129 [ "$verbose" ] && echo >&2 " $note_"
Junio C Hamano853a3692005-08-20 02:54:34 -0700130 fi
131 if test "$local_name_" != ""
132 then
133 # We are storing the head locally. Make sure that it is
134 # a fast forward (aka "reverse push").
Junio C Hamano06ec2b42005-09-02 02:34:13 -0700135 fast_forward_local "$local_name_" "$head_" "$note_"
Junio C Hamano853a3692005-08-20 02:54:34 -0700136 fi
137}
138
139fast_forward_local () {
Junio C Hamano866ff2f2005-09-10 10:40:47 -0700140 mkdir -p "$(dirname "$GIT_DIR/$1")"
Junio C Hamano853a3692005-08-20 02:54:34 -0700141 case "$1" in
142 refs/tags/*)
143 # Tags need not be pointing at commits so there
144 # is no way to guarantee "fast-forward" anyway.
Junio C Hamanoae2da402005-08-22 21:28:33 -0700145 if test -f "$GIT_DIR/$1"
146 then
Junio C Hamanof8765792005-10-18 18:42:14 -0700147 if now_=$(cat "$GIT_DIR/$1") && test "$now_" = "$2"
148 then
Linus Torvalds583122c2005-11-18 08:31:55 -0800149 [ "$verbose" ] && echo >&2 "* $1: same as $3"
Junio C Hamanof8765792005-10-18 18:42:14 -0700150 else
151 echo >&2 "* $1: updating with $3"
152 fi
Junio C Hamanoae2da402005-08-22 21:28:33 -0700153 else
Junio C Hamano06ec2b42005-09-02 02:34:13 -0700154 echo >&2 "* $1: storing $3"
Junio C Hamanoae2da402005-08-22 21:28:33 -0700155 fi
Eric Wong687b8be2006-03-10 04:19:07 -0800156 git-update-ref "$1" "$2"
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700157 ;;
Junio C Hamanoae2da402005-08-22 21:28:33 -0700158
Eric Wong687b8be2006-03-10 04:19:07 -0800159 refs/heads/* | refs/remotes/*)
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700160 # $1 is the ref being updated.
161 # $2 is the new value for the ref.
162 local=$(git-rev-parse --verify "$1^0" 2>/dev/null)
163 if test "$local"
Junio C Hamano853a3692005-08-20 02:54:34 -0700164 then
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700165 # Require fast-forward.
Junio C Hamano853a3692005-08-20 02:54:34 -0700166 mb=$(git-merge-base "$local" "$2") &&
167 case "$2,$mb" in
168 $local,*)
Junio C Hamano06ec2b42005-09-02 02:34:13 -0700169 echo >&2 "* $1: same as $3"
Junio C Hamano853a3692005-08-20 02:54:34 -0700170 ;;
171 *,$local)
Junio C Hamano06ec2b42005-09-02 02:34:13 -0700172 echo >&2 "* $1: fast forward to $3"
Lukas Sandström9d7f73d2006-02-25 12:20:13 +0100173 echo >&2 " from $local to $2"
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700174 git-update-ref "$1" "$2" "$local"
Junio C Hamano853a3692005-08-20 02:54:34 -0700175 ;;
176 *)
177 false
178 ;;
179 esac || {
Junio C Hamano06ec2b42005-09-02 02:34:13 -0700180 echo >&2 "* $1: does not fast forward to $3;"
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700181 case ",$force,$single_force," in
182 *,t,*)
Junio C Hamano06ec2b42005-09-02 02:34:13 -0700183 echo >&2 " forcing update."
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700184 git-update-ref "$1" "$2" "$local"
Junio C Hamanoae2da402005-08-22 21:28:33 -0700185 ;;
186 *)
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700187 echo >&2 " not updating."
Junio C Hamanoa9698bb2006-03-16 22:04:18 -0800188 exit 1
Junio C Hamanoae2da402005-08-22 21:28:33 -0700189 ;;
190 esac
Junio C Hamano853a3692005-08-20 02:54:34 -0700191 }
192 else
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700193 echo >&2 "* $1: storing $3"
194 git-update-ref "$1" "$2"
Junio C Hamano853a3692005-08-20 02:54:34 -0700195 fi
Linus Torvalds0a623e72005-07-05 11:38:37 -0700196 ;;
Junio C Hamano853a3692005-08-20 02:54:34 -0700197 esac
198}
199
Junio C Hamanob10ac502005-08-25 18:15:32 -0700200case "$update_head_ok" in
201'')
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700202 orig_head=$(git-rev-parse --verify HEAD 2>/dev/null)
Junio C Hamanob10ac502005-08-25 18:15:32 -0700203 ;;
204esac
205
Linus Torvaldsed1aadf2005-09-29 14:35:15 -0700206# If --tags (and later --heads or --all) is specified, then we are
207# not talking about defaults stored in Pull: line of remotes or
208# branches file, and just fetch those and refspecs explicitly given.
209# Otherwise we do what we always did.
210
211reflist=$(get_remote_refs_for_fetch "$@")
212if test "$tags"
213then
Junio C Hamano81214e42006-01-05 19:42:12 -0800214 taglist=$(IFS=" " &&
Michal Ostrowski96b086d2006-01-20 13:38:16 -0500215 git-ls-remote $upload_pack --tags "$remote" |
Junio C Hamano81214e42006-01-05 19:42:12 -0800216 while read sha1 name
217 do
218 case "$name" in
219 (*^*) continue ;;
220 esac
221 if git-check-ref-format "$name"
222 then
223 echo ".${name}:${name}"
224 else
225 echo >&2 "warning: tag ${name} ignored"
226 fi
227 done)
Linus Torvaldsed1aadf2005-09-29 14:35:15 -0700228 if test "$#" -gt 1
229 then
230 # remote URL plus explicit refspecs; we need to merge them.
Junio C Hamano221e7432005-10-10 23:22:02 -0700231 reflist="$reflist$LF$taglist"
Linus Torvaldsed1aadf2005-09-29 14:35:15 -0700232 else
233 # No explicit refspecs; fetch tags only.
234 reflist=$taglist
235 fi
236fi
237
Junio C Hamano03febf92006-01-07 00:48:04 -0800238fetch_main () {
239 reflist="$1"
240 refs=
Junio C Hamano853a3692005-08-20 02:54:34 -0700241
Junio C Hamano03febf92006-01-07 00:48:04 -0800242 for ref in $reflist
243 do
244 refs="$refs$LF$ref"
Junio C Hamano853a3692005-08-20 02:54:34 -0700245
Junio C Hamano03febf92006-01-07 00:48:04 -0800246 # These are relative path from $GIT_DIR, typically starting at refs/
247 # but may be HEAD
Mark Woodingf327dbc2006-04-13 22:01:24 +0000248 if expr "z$ref" : 'z\.' >/dev/null
Junio C Hamano03febf92006-01-07 00:48:04 -0800249 then
250 not_for_merge=t
Mark Woodingf327dbc2006-04-13 22:01:24 +0000251 ref=$(expr "z$ref" : 'z\.\(.*\)')
Junio C Hamano03febf92006-01-07 00:48:04 -0800252 else
253 not_for_merge=
254 fi
Junio C Hamanodfdcb552006-04-13 19:05:38 -0700255 if expr "z$ref" : 'z+' >/dev/null
Junio C Hamano03febf92006-01-07 00:48:04 -0800256 then
257 single_force=t
Junio C Hamanodfdcb552006-04-13 19:05:38 -0700258 ref=$(expr "z$ref" : 'z+\(.*\)')
Junio C Hamano03febf92006-01-07 00:48:04 -0800259 else
260 single_force=
261 fi
Mark Woodingf327dbc2006-04-13 22:01:24 +0000262 remote_name=$(expr "z$ref" : 'z\([^:]*\):')
263 local_name=$(expr "z$ref" : 'z[^:]*:\(.*\)')
Junio C Hamano853a3692005-08-20 02:54:34 -0700264
Junio C Hamano03febf92006-01-07 00:48:04 -0800265 rref="$rref$LF$remote_name"
Junio C Hamano4447bad2005-09-17 11:56:41 -0700266
Junio C Hamano03febf92006-01-07 00:48:04 -0800267 # There are transports that can fetch only one head at a time...
268 case "$remote" in
269 http://* | https://*)
270 if [ -n "$GIT_SSL_NO_VERIFY" ]; then
271 curl_extra_args="-k"
272 fi
273 remote_name_quoted=$(perl -e '
274 my $u = $ARGV[0];
275 $u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg;
276 print "$u";
277 ' "$remote_name")
278 head=$(curl -nsfL $curl_extra_args "$remote/$remote_name_quoted") &&
Mark Woodingf327dbc2006-04-13 22:01:24 +0000279 expr "z$head" : "z$_x40\$" >/dev/null ||
Junio C Hamano03febf92006-01-07 00:48:04 -0800280 die "Failed to fetch $remote_name from $remote"
281 echo >&2 Fetching "$remote_name from $remote" using http
282 git-http-fetch -v -a "$head" "$remote/" || exit
283 ;;
284 rsync://*)
285 TMP_HEAD="$GIT_DIR/TMP_HEAD"
286 rsync -L -q "$remote/$remote_name" "$TMP_HEAD" || exit 1
287 head=$(git-rev-parse --verify TMP_HEAD)
288 rm -f "$TMP_HEAD"
289 test "$rsync_slurped_objects" || {
290 rsync -av --ignore-existing --exclude info \
291 "$remote/objects/" "$GIT_OBJECT_DIRECTORY/" || exit
Junio C Hamano853a3692005-08-20 02:54:34 -0700292
Junio C Hamano03febf92006-01-07 00:48:04 -0800293 # Look at objects/info/alternates for rsync -- http will
294 # support it natively and git native ones will do it on
295 # the remote end. Not having that file is not a crime.
296 rsync -q "$remote/objects/info/alternates" \
297 "$GIT_DIR/TMP_ALT" 2>/dev/null ||
298 rm -f "$GIT_DIR/TMP_ALT"
299 if test -f "$GIT_DIR/TMP_ALT"
300 then
301 resolve_alternates "$remote" <"$GIT_DIR/TMP_ALT" |
302 while read alt
303 do
304 case "$alt" in 'bad alternate: '*) die "$alt";; esac
305 echo >&2 "Getting alternate: $alt"
306 rsync -av --ignore-existing --exclude info \
307 "$alt" "$GIT_OBJECT_DIRECTORY/" || exit
308 done
309 rm -f "$GIT_DIR/TMP_ALT"
310 fi
311 rsync_slurped_objects=t
312 }
313 ;;
314 *)
315 # We will do git native transport with just one call later.
316 continue ;;
317 esac
Junio C Hamano853a3692005-08-20 02:54:34 -0700318
Junio C Hamano03febf92006-01-07 00:48:04 -0800319 append_fetch_head "$head" "$remote" \
320 "$remote_name" "$remote_nick" "$local_name" "$not_for_merge"
Junio C Hamano853a3692005-08-20 02:54:34 -0700321
Junio C Hamano03febf92006-01-07 00:48:04 -0800322 done
323
324 case "$remote" in
325 http://* | https://* | rsync://* )
326 ;; # we are already done.
327 *)
328 ( : subshell because we muck with IFS
329 IFS=" $LF"
330 (
Junio C Hamanob19696c2006-02-20 00:38:39 -0800331 git-fetch-pack $exec $keep --thin "$remote" $rref || echo failed "$remote"
Junio C Hamano03febf92006-01-07 00:48:04 -0800332 ) |
333 while read sha1 remote_name
334 do
335 case "$sha1" in
336 failed)
337 echo >&2 "Fetch failure: $remote"
338 exit 1 ;;
339 esac
340 found=
341 single_force=
342 for ref in $refs
343 do
344 case "$ref" in
345 +$remote_name:*)
346 single_force=t
347 not_for_merge=
348 found="$ref"
349 break ;;
350 .+$remote_name:*)
351 single_force=t
352 not_for_merge=t
353 found="$ref"
354 break ;;
355 .$remote_name:*)
356 not_for_merge=t
357 found="$ref"
358 break ;;
359 $remote_name:*)
360 not_for_merge=
361 found="$ref"
362 break ;;
363 esac
364 done
Mark Woodingf327dbc2006-04-13 22:01:24 +0000365 local_name=$(expr "z$found" : 'z[^:]*:\(.*\)')
Junio C Hamano03febf92006-01-07 00:48:04 -0800366 append_fetch_head "$sha1" "$remote" \
367 "$remote_name" "$remote_nick" "$local_name" "$not_for_merge"
368 done
369 ) || exit ;;
370 esac
371
372}
373
374fetch_main "$reflist"
375
376# automated tag following
377case "$no_tags$tags" in
378'')
Junio C Hamano6dc78e62006-02-22 13:10:37 -0800379 case "$reflist" in
380 *:refs/*)
381 # effective only when we are following remote branch
382 # using local tracking branch.
383 taglist=$(IFS=" " &&
384 git-ls-remote $upload_pack --tags "$remote" |
385 sed -ne 's|^\([0-9a-f]*\)[ ]\(refs/tags/.*\)^{}$|\1 \2|p' |
386 while read sha1 name
387 do
388 test -f "$GIT_DIR/$name" && continue
389 git-check-ref-format "$name" || {
390 echo >&2 "warning: tag ${name} ignored"
391 continue
392 }
393 git-cat-file -t "$sha1" >/dev/null 2>&1 || continue
394 echo >&2 "Auto-following $name"
395 echo ".${name}:${name}"
396 done)
397 esac
Junio C Hamano03febf92006-01-07 00:48:04 -0800398 case "$taglist" in
399 '') ;;
400 ?*)
401 fetch_main "$taglist" ;;
402 esac
Junio C Hamano853a3692005-08-20 02:54:34 -0700403esac
Junio C Hamanob10ac502005-08-25 18:15:32 -0700404
405# If the original head was empty (i.e. no "master" yet), or
406# if we were told not to worry, we do not have to check.
407case ",$update_head_ok,$orig_head," in
408*,, | t,* )
409 ;;
410*)
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700411 curr_head=$(git-rev-parse --verify HEAD 2>/dev/null)
Junio C Hamanob10ac502005-08-25 18:15:32 -0700412 if test "$curr_head" != "$orig_head"
413 then
Junio C Hamanobf7960e2005-09-27 18:14:27 -0700414 git-update-ref HEAD "$orig_head"
Junio C Hamanob10ac502005-08-25 18:15:32 -0700415 die "Cannot fetch into the current branch."
416 fi
417 ;;
418esac