git-revert with conflicts to behave as git-merge with conflicts
[git/jrn.git] / git-fetch.sh
blobe8a766818282d1ace559d4a5148927a656e2b492
1 #!/bin/sh
4 USAGE='<fetch-options> <repository> <refspec>...'
5 . git-sh-setup
6 . git-parse-remote
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"
10 LF='
12 IFS="$LF"
14 rloga=fetch
15 no_tags=
16 tags=
17 append=
18 force=
19 verbose=
20 update_head_ok=
21 exec=
22 upload_pack=
23 keep=--thin
24 while case "$#" in 0) break ;; esac
26 case "$1" in
27 -a|--a|--ap|--app|--appe|--appen|--append)
28 append=t
30 --upl|--uplo|--uploa|--upload|--upload-|--upload-p|\
31 --upload-pa|--upload-pac|--upload-pack)
32 shift
33 exec="--exec=$1"
34 upload_pack="-u $1"
36 -f|--f|--fo|--for|--forc|--force)
37 force=t
39 -t|--t|--ta|--tag|--tags)
40 tags=t
42 -n|--n|--no|--no-|--no-t|--no-ta|--no-tag|--no-tags)
43 no_tags=t
45 -u|--u|--up|--upd|--upda|--updat|--update|--update-|--update-h|\
46 --update-he|--update-hea|--update-head|--update-head-|\
47 --update-head-o|--update-head-ok)
48 update_head_ok=t
50 -v|--verbose)
51 verbose=Yes
53 -k|--k|--ke|--kee|--keep)
54 keep=--keep
56 --reflog-action=*)
57 rloga=`expr "z$1" : 'z-[^=]*=\(.*\)'`
59 -*)
60 usage
63 break
65 esac
66 shift
67 done
69 case "$#" in
71 origin=$(get_default_remote)
72 test -n "$(get_remote_url ${origin})" ||
73 die "Where do you want to fetch from today?"
74 set x $origin ; shift ;;
75 esac
77 remote_nick="$1"
78 remote=$(get_remote_url "$@")
79 refs=
80 rref=
81 rsync_slurped_objects=
83 rloga="$rloga $remote_nick"
84 test "$remote_nick" = "$remote" || rloga="$rloga $remote"
86 if test "" = "$append"
87 then
88 : >"$GIT_DIR/FETCH_HEAD"
91 append_fetch_head () {
92 head_="$1"
93 remote_="$2"
94 remote_name_="$3"
95 remote_nick_="$4"
96 local_name_="$5"
97 case "$6" in
98 t) not_for_merge_='not-for-merge' ;;
99 '') not_for_merge_= ;;
100 esac
102 # remote-nick is the URL given on the command line (or a shorthand)
103 # remote-name is the $GIT_DIR relative refs/ path we computed
104 # for this refspec.
106 # the $note_ variable will be fed to git-fmt-merge-msg for further
107 # processing.
108 case "$remote_name_" in
109 HEAD)
110 note_= ;;
111 refs/heads/*)
112 note_="$(expr "$remote_name_" : 'refs/heads/\(.*\)')"
113 note_="branch '$note_' of " ;;
114 refs/tags/*)
115 note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')"
116 note_="tag '$note_' of " ;;
117 refs/remotes/*)
118 note_="$(expr "$remote_name_" : 'refs/remotes/\(.*\)')"
119 note_="remote branch '$note_' of " ;;
121 note_="$remote_name of " ;;
122 esac
123 remote_1_=$(expr "z$remote_" : 'z\(.*\)\.git/*$') &&
124 remote_="$remote_1_"
125 note_="$note_$remote_"
127 # 2.6.11-tree tag would not be happy to be fed to resolve.
128 if git-cat-file commit "$head_" >/dev/null 2>&1
129 then
130 headc_=$(git-rev-parse --verify "$head_^0") || exit
131 echo "$headc_ $not_for_merge_ $note_" >>"$GIT_DIR/FETCH_HEAD"
132 [ "$verbose" ] && echo >&2 "* committish: $head_"
133 [ "$verbose" ] && echo >&2 " $note_"
134 else
135 echo "$head_ not-for-merge $note_" >>"$GIT_DIR/FETCH_HEAD"
136 [ "$verbose" ] && echo >&2 "* non-commit: $head_"
137 [ "$verbose" ] && echo >&2 " $note_"
139 if test "$local_name_" != ""
140 then
141 # We are storing the head locally. Make sure that it is
142 # a fast forward (aka "reverse push").
143 fast_forward_local "$local_name_" "$head_" "$note_"
147 fast_forward_local () {
148 mkdir -p "$(dirname "$GIT_DIR/$1")"
149 case "$1" in
150 refs/tags/*)
151 # Tags need not be pointing at commits so there
152 # is no way to guarantee "fast-forward" anyway.
153 if test -f "$GIT_DIR/$1"
154 then
155 if now_=$(cat "$GIT_DIR/$1") && test "$now_" = "$2"
156 then
157 [ "$verbose" ] && echo >&2 "* $1: same as $3" ||:
158 else
159 echo >&2 "* $1: updating with $3"
160 git-update-ref -m "$rloga: updating tag" "$1" "$2"
162 else
163 echo >&2 "* $1: storing $3"
164 git-update-ref -m "$rloga: storing tag" "$1" "$2"
168 refs/heads/* | refs/remotes/*)
169 # $1 is the ref being updated.
170 # $2 is the new value for the ref.
171 local=$(git-rev-parse --verify "$1^0" 2>/dev/null)
172 if test "$local"
173 then
174 # Require fast-forward.
175 mb=$(git-merge-base "$local" "$2") &&
176 case "$2,$mb" in
177 $local,*)
178 if test -n "$verbose"
179 then
180 echo >&2 "* $1: same as $3"
183 *,$local)
184 echo >&2 "* $1: fast forward to $3"
185 echo >&2 " from $local to $2"
186 git-update-ref -m "$rloga: fast-forward" "$1" "$2" "$local"
189 false
191 esac || {
192 echo >&2 "* $1: does not fast forward to $3;"
193 case ",$force,$single_force," in
194 *,t,*)
195 echo >&2 " forcing update."
196 git-update-ref -m "$rloga: forced-update" "$1" "$2" "$local"
199 echo >&2 " not updating."
200 exit 1
202 esac
204 else
205 echo >&2 "* $1: storing $3"
206 git-update-ref -m "$rloga: storing head" "$1" "$2"
209 esac
212 case "$update_head_ok" in
214 orig_head=$(git-rev-parse --verify HEAD 2>/dev/null)
216 esac
218 # If --tags (and later --heads or --all) is specified, then we are
219 # not talking about defaults stored in Pull: line of remotes or
220 # branches file, and just fetch those and refspecs explicitly given.
221 # Otherwise we do what we always did.
223 reflist=$(get_remote_refs_for_fetch "$@")
224 if test "$tags"
225 then
226 taglist=`IFS=" " &&
228 git-ls-remote $upload_pack --tags "$remote" ||
229 echo fail ouch
231 while read sha1 name
233 case "$sha1" in
234 fail)
235 exit 1
236 esac
237 case "$name" in
238 *^*) continue ;;
239 esac
240 if git-check-ref-format "$name"
241 then
242 echo ".${name}:${name}"
243 else
244 echo >&2 "warning: tag ${name} ignored"
246 done` || exit
247 if test "$#" -gt 1
248 then
249 # remote URL plus explicit refspecs; we need to merge them.
250 reflist="$reflist$LF$taglist"
251 else
252 # No explicit refspecs; fetch tags only.
253 reflist=$taglist
257 fetch_main () {
258 reflist="$1"
259 refs=
260 rref=
262 for ref in $reflist
264 refs="$refs$LF$ref"
266 # These are relative path from $GIT_DIR, typically starting at refs/
267 # but may be HEAD
268 if expr "z$ref" : 'z\.' >/dev/null
269 then
270 not_for_merge=t
271 ref=$(expr "z$ref" : 'z\.\(.*\)')
272 else
273 not_for_merge=
275 if expr "z$ref" : 'z+' >/dev/null
276 then
277 single_force=t
278 ref=$(expr "z$ref" : 'z+\(.*\)')
279 else
280 single_force=
282 remote_name=$(expr "z$ref" : 'z\([^:]*\):')
283 local_name=$(expr "z$ref" : 'z[^:]*:\(.*\)')
285 rref="$rref$LF$remote_name"
287 # There are transports that can fetch only one head at a time...
288 case "$remote" in
289 http://* | https://* | ftp://*)
290 if [ -n "$GIT_SSL_NO_VERIFY" ]; then
291 curl_extra_args="-k"
293 if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \
294 "`git-repo-config --bool http.noEPSV`" = true ]; then
295 noepsv_opt="--disable-epsv"
297 max_depth=5
298 depth=0
299 head="ref: $remote_name"
300 while (expr "z$head" : "zref:" && expr $depth \< $max_depth) >/dev/null
302 remote_name_quoted=$(@@PERL@@ -e '
303 my $u = $ARGV[0];
304 $u =~ s/^ref:\s*//;
305 $u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg;
306 print "$u";
307 ' "$head")
308 head=$(curl -nsfL $curl_extra_args $noepsv_opt "$remote/$remote_name_quoted")
309 depth=$( expr \( $depth + 1 \) )
310 done
311 expr "z$head" : "z$_x40\$" >/dev/null ||
312 die "Failed to fetch $remote_name from $remote"
313 echo >&2 Fetching "$remote_name from $remote" using http
314 git-http-fetch -v -a "$head" "$remote/" || exit
316 rsync://*)
317 TMP_HEAD="$GIT_DIR/TMP_HEAD"
318 rsync -L -q "$remote/$remote_name" "$TMP_HEAD" || exit 1
319 head=$(git-rev-parse --verify TMP_HEAD)
320 rm -f "$TMP_HEAD"
321 test "$rsync_slurped_objects" || {
322 rsync -av --ignore-existing --exclude info \
323 "$remote/objects/" "$GIT_OBJECT_DIRECTORY/" || exit
325 # Look at objects/info/alternates for rsync -- http will
326 # support it natively and git native ones will do it on
327 # the remote end. Not having that file is not a crime.
328 rsync -q "$remote/objects/info/alternates" \
329 "$GIT_DIR/TMP_ALT" 2>/dev/null ||
330 rm -f "$GIT_DIR/TMP_ALT"
331 if test -f "$GIT_DIR/TMP_ALT"
332 then
333 resolve_alternates "$remote" <"$GIT_DIR/TMP_ALT" |
334 while read alt
336 case "$alt" in 'bad alternate: '*) die "$alt";; esac
337 echo >&2 "Getting alternate: $alt"
338 rsync -av --ignore-existing --exclude info \
339 "$alt" "$GIT_OBJECT_DIRECTORY/" || exit
340 done
341 rm -f "$GIT_DIR/TMP_ALT"
343 rsync_slurped_objects=t
347 # We will do git native transport with just one call later.
348 continue ;;
349 esac
351 append_fetch_head "$head" "$remote" \
352 "$remote_name" "$remote_nick" "$local_name" "$not_for_merge"
354 done
356 case "$remote" in
357 http://* | https://* | ftp://* | rsync://* )
358 ;; # we are already done.
360 ( : subshell because we muck with IFS
361 IFS=" $LF"
363 git-fetch-pack $exec $keep "$remote" $rref || echo failed "$remote"
365 while read sha1 remote_name
367 case "$sha1" in
368 failed)
369 echo >&2 "Fetch failure: $remote"
370 exit 1 ;;
371 esac
372 found=
373 single_force=
374 for ref in $refs
376 case "$ref" in
377 +$remote_name:*)
378 single_force=t
379 not_for_merge=
380 found="$ref"
381 break ;;
382 .+$remote_name:*)
383 single_force=t
384 not_for_merge=t
385 found="$ref"
386 break ;;
387 .$remote_name:*)
388 not_for_merge=t
389 found="$ref"
390 break ;;
391 $remote_name:*)
392 not_for_merge=
393 found="$ref"
394 break ;;
395 esac
396 done
397 local_name=$(expr "z$found" : 'z[^:]*:\(.*\)')
398 append_fetch_head "$sha1" "$remote" \
399 "$remote_name" "$remote_nick" "$local_name" "$not_for_merge"
400 done
401 ) || exit ;;
402 esac
406 fetch_main "$reflist"
408 # automated tag following
409 case "$no_tags$tags" in
411 case "$reflist" in
412 *:refs/*)
413 # effective only when we are following remote branch
414 # using local tracking branch.
415 taglist=$(IFS=" " &&
416 git-ls-remote $upload_pack --tags "$remote" |
417 sed -ne 's|^\([0-9a-f]*\)[ ]\(refs/tags/.*\)^{}$|\1 \2|p' |
418 while read sha1 name
420 git-show-ref --verify --quiet -- $name && continue
421 git-check-ref-format "$name" || {
422 echo >&2 "warning: tag ${name} ignored"
423 continue
425 git-cat-file -t "$sha1" >/dev/null 2>&1 || continue
426 echo >&2 "Auto-following $name"
427 echo ".${name}:${name}"
428 done)
429 esac
430 case "$taglist" in
431 '') ;;
433 fetch_main "$taglist" ;;
434 esac
435 esac
437 # If the original head was empty (i.e. no "master" yet), or
438 # if we were told not to worry, we do not have to check.
439 case ",$update_head_ok,$orig_head," in
440 *,, | t,* )
443 curr_head=$(git-rev-parse --verify HEAD 2>/dev/null)
444 if test "$curr_head" != "$orig_head"
445 then
446 git-update-ref \
447 -m "$rloga: Undoing incorrectly fetched HEAD." \
448 HEAD "$orig_head"
449 die "Cannot fetch into the current branch."
452 esac