X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-fetch-script;h=dd94edeb38eb47dc6abf5e00c1a5d8c067a76f74;hb=ff3412ee1f74cc267e6d65c03c5fd8ea2214fbe7;hp=fce43e6dc07c698eba292f5f07f9c24786280e0e;hpb=f170e4b39d87365cda17b80436ba6db4a2044e88;p=git.git diff --git a/git-fetch-script b/git-fetch-script index fce43e6d..dd94edeb 100755 --- a/git-fetch-script +++ b/git-fetch-script @@ -1,39 +1,229 @@ #!/bin/sh # . git-sh-setup-script || die "Not a git archive" -. git-parse-remote "$@" -merge_repo="$_remote_repo" -merge_head="$_remote_head" -merge_store="$_remote_store" - -TMP_HEAD="$GIT_DIR/TMP_HEAD" - -case "$merge_repo" in -http://*) - head=$(wget -q -O - "$merge_repo/$merge_head") || exit 1 - echo Fetching "$merge_head" using http - git-http-pull -v -a "$merge_head" "$merge_repo/" +. git-parse-remote-script +_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' +_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" + +append= +force= +update_head_ok= +while case "$#" in 0) break ;; esac +do + case "$1" in + -a|--a|--ap|--app|--appe|--appen|--append) + append=t + ;; + -f|--f|--fo|--for|--forc|--force) + force=t + ;; + -u|--u|--up|--upd|--upda|--updat|--update|--update-|--update-h|\ + --update-he|--update-hea|--update-head|--update-head-|\ + --update-head-o|--update-head-ok) + update_head_ok=t + ;; + *) + break + ;; + esac + shift +done + +case "$#" in +0) + test -f "$GIT_DIR/branches/origin" || + test -f "$GIT_DIR/remotes/origin" || + die "Where do you want to fetch from today?" + set origin ;; +esac + +remote_nick="$1" +remote=$(get_remote_url "$@") +refs= +rref= +rsync_slurped_objects= + +if test "" = "$append" +then + : >$GIT_DIR/FETCH_HEAD +fi + +append_fetch_head () { + head_="$1" + remote_="$2" + remote_name_="$3" + remote_nick_="$4" + local_name_="$5" + + # 2.6.11-tree tag would not be happy to be fed to resolve. + if git-cat-file commit "$head_" >/dev/null 2>&1 + then + headc_=$(git-rev-parse --verify "$head_^0") || exit + note_="$headc_ $remote_name_ from $remote_nick_" + echo "$note_" >>$GIT_DIR/FETCH_HEAD + echo >&2 "* committish: $note_" + else + echo >&2 "* non-commit: $note_" + fi + if test "$local_name_" != "" + then + # We are storing the head locally. Make sure that it is + # a fast forward (aka "reverse push"). + fast_forward_local "$local_name_" "$head_" "$remote_" "$remote_name_" + fi +} + +fast_forward_local () { + case "$1" in + refs/tags/*) + # Tags need not be pointing at commits so there + # is no way to guarantee "fast-forward" anyway. + if test -f "$GIT_DIR/$1" + then + echo >&2 "* $1: updating with $4" + echo >&2 " from $3." + else + echo >&2 "* $1: storing $4" + echo >&2 " from $3." + fi + echo "$2" >"$GIT_DIR/$1" ;; + + refs/heads/*) + # NEEDSWORK: use the same cmpxchg protocol here. + echo "$2" >"$GIT_DIR/$1.lock" + if test -f "$GIT_DIR/$1" + then + local=$(git-rev-parse --verify "$1^0") && + mb=$(git-merge-base "$local" "$2") && + case "$2,$mb" in + $local,*) + echo >&2 "* $1: same as $4" + echo >&2 " from $3" + ;; + *,$local) + echo >&2 "* $1: fast forward to $4" + echo >&2 " from $3" + ;; + *) + false + ;; + esac || { + echo >&2 "* $1: does not fast forward to $4" + case "$force,$single_force" in + t,* | *,t) + echo >&2 " from $3; forcing update." + ;; + *) + mv "$GIT_DIR/$1.lock" "$GIT_DIR/$1.remote" + echo >&2 " from $3; leaving it in '$1.remote'" + ;; + esac + } + else + echo >&2 "* $1: storing $4" + echo >&2 " from $3." + fi + test -f "$GIT_DIR/$1.lock" && + mv "$GIT_DIR/$1.lock" "$GIT_DIR/$1" + ;; + esac +} + +case "$update_head_ok" in +'') + orig_head=$(cat "$GIT_DIR/HEAD" 2>/dev/null) + ;; +esac + +for ref in $(get_remote_refs_for_fetch "$@") +do + refs="$refs $ref" + + # These are relative path from $GIT_DIR, typically starting at refs/ + # but may be HEAD + if expr "$ref" : '\+' >/dev/null + then + single_force=t + ref=$(expr "$ref" : '\+\(.*\)') + else + single_force= + fi + remote_name=$(expr "$ref" : '\([^:]*\):') + local_name=$(expr "$ref" : '[^:]*:\(.*\)') + + rref="$rref $remote_name" + + # There are transports that can fetch only one head at a time... + case "$remote" in + http://* | https://*) + if [ -n "$GIT_SSL_NO_VERIFY" ]; then + curl_extra_args="-k" + fi + head=$(curl -nsf $curl_extra_args "$remote/$remote_name") && + expr "$head" : "$_x40\$" >/dev/null || + die "Failed to fetch $remote_name from $remote" + echo Fetching "$remote_name from $remote" using http + git-http-pull -v -a "$head" "$remote/" || exit ;; -rsync://*) - rsync -L "$merge_repo/$merge_head" "$TMP_HEAD" || exit 1 + rsync://*) + TMP_HEAD="$GIT_DIR/TMP_HEAD" + rsync -L "$remote/$remote_name" "$TMP_HEAD" || exit 1 head=$(git-rev-parse TMP_HEAD) rm -f "$TMP_HEAD" - rsync -avz --ignore-existing "$merge_repo/objects/" "$GIT_OBJECT_DIRECTORY/" - ;; -*) - head=$(git-fetch-pack "$merge_repo" "$merge_head") + test "$rsync_slurped_objects" || { + rsync -avz --ignore-existing "$remote/objects/" \ + "$GIT_OBJECT_DIRECTORY/" || exit + rsync_slurped_objects=t + } ;; -esac || exit 1 + *) + # We will do git native transport with just one call later. + continue ;; + esac -git-rev-parse --verify "$head" > /dev/null || exit 1 + append_fetch_head "$head" "$remote" "$remote_name" "$remote_nick" "$local_name" -case "$merge_store" in -'') - echo "$head" > "$GIT_DIR/$merge_store" -esac && +done + +case "$remote" in +http://* | https://* | rsync://* ) + ;; # we are already done. +*) + git-fetch-pack "$remote" $rref | + while read sha1 remote_name + do + found= + single_force= + for ref in $refs + do + case "$ref" in + +$remote_name:*) + single_force=t + found="$ref" + break ;; + $remote_name:*) + found="$ref" + break ;; + esac + done -# FETCH_HEAD is fed to git-resolve-script which will eventually be -# passed to git-commit-tree as one of the parents. Make sure we do -# not give a tag object ID. + local_name=$(expr "$found" : '[^:]*:\(.*\)') + append_fetch_head "$sha1" "$remote" "$remote_name" "$remote_nick" "$local_name" + done + ;; +esac -git-rev-parse "$head^0" >"$GIT_DIR/FETCH_HEAD" +# If the original head was empty (i.e. no "master" yet), or +# if we were told not to worry, we do not have to check. +case ",$update_head_ok,$orig_head," in +*,, | t,* ) + ;; +*) + curr_head=$(cat "$GIT_DIR/HEAD" 2>/dev/null) + if test "$curr_head" != "$orig_head" + then + echo "$orig_head" >$GIT_DIR/HEAD + die "Cannot fetch into the current branch." + fi + ;; +esac