Merge branch 'js/fetch-progress'

* js/fetch-progress:
  git-fetch: add --quiet

diff --combined git-fetch.sh
index fd70696b7479ad08eedbb44b75654f07247cc37b,3aa117e321a83c7bda912530cb847ee7a73ced02..b04bd553f86213478a36f8ec2f19476f02ccf09f
--- 1/git-fetch.sh
--- 2/git-fetch.sh
+++ b/git-fetch.sh
@@@ -26,6 -26,7 +26,7 @@@ keep
  shallow_depth=
  no_progress=
  test -t 1 || no_progress=--no-progress
+ quiet=
  while case "$#" in 0) break ;; esac
  do
        case "$1" in
@@@ -56,6 -57,9 +57,9 @@@
        --update-head-o|--update-head-ok)
                update_head_ok=t
                ;;
+       -q|--q|--qu|--qui|--quie|--quiet)
+               quiet=--quiet
+               ;;
        -v|--verbose)
                verbose=Yes
                ;;
@@@ -109,11 -113,133 +113,11 @@@ ls_remote_result=$(git ls-remote $exec 
        die "Cannot get the repository state from $remote"
  
  append_fetch_head () {
 -    head_="$1"
 -    remote_="$2"
 -    remote_name_="$3"
 -    remote_nick_="$4"
 -    local_name_="$5"
 -    case "$6" in
 -    t) not_for_merge_='not-for-merge' ;;
 -    '') not_for_merge_= ;;
 -    esac
 -
 -    # remote-nick is the URL given on the command line (or a shorthand)
 -    # remote-name is the $GIT_DIR relative refs/ path we computed
 -    # for this refspec.
 -
 -    # the $note_ variable will be fed to git-fmt-merge-msg for further
 -    # processing.
 -    case "$remote_name_" in
 -    HEAD)
 -      note_= ;;
 -    refs/heads/*)
 -      note_="$(expr "$remote_name_" : 'refs/heads/\(.*\)')"
 -      note_="branch '$note_' of " ;;
 -    refs/tags/*)
 -      note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')"
 -      note_="tag '$note_' of " ;;
 -    refs/remotes/*)
 -      note_="$(expr "$remote_name_" : 'refs/remotes/\(.*\)')"
 -      note_="remote branch '$note_' of " ;;
 -    *)
 -      note_="$remote_name of " ;;
 -    esac
 -    remote_1_=$(expr "z$remote_" : 'z\(.*\)\.git/*$') &&
 -      remote_="$remote_1_"
 -    note_="$note_$remote_"
 -
 -    # 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
 -      echo "$headc_   $not_for_merge_ $note_" >>"$GIT_DIR/FETCH_HEAD"
 -    else
 -      echo "$head_    not-for-merge   $note_" >>"$GIT_DIR/FETCH_HEAD"
 -    fi
 -
 -    update_local_ref "$local_name_" "$head_" "$note_"
 -}
 -
 -update_local_ref () {
 -    # If we are storing the head locally make sure that it is
 -    # a fast forward (aka "reverse push").
 -
 -    label_=$(git-cat-file -t $2)
 -    newshort_=$(git-rev-parse --short $2)
 -    if test -z "$1" ; then
 -      [ "$verbose" ] && echo >&2 "* fetched $3"
 -      [ "$verbose" ] && echo >&2 "  $label_: $newshort_"
 -      return 0
 -    fi
 -    oldshort_=$(git show-ref --hash --abbrev "$1" 2>/dev/null)
 -
 -    case "$1" in
 -    refs/tags/*)
 -      # Tags need not be pointing at commits so there
 -      # is no way to guarantee "fast-forward" anyway.
 -      if test -n "$oldshort_"
 -      then
 -              if now_=$(git show-ref --hash "$1") && test "$now_" = "$2"
 -              then
 -                      [ "$verbose" ] && echo >&2 "* $1: same as $3"
 -                      [ "$verbose" ] && echo >&2 "  $label_: $newshort_" ||:
 -              else
 -                      echo >&2 "* $1: updating with $3"
 -                      echo >&2 "  $label_: $newshort_"
 -                      git-update-ref -m "$GIT_REFLOG_ACTION: updating tag" "$1" "$2"
 -              fi
 -      else
 -              echo >&2 "* $1: storing $3"
 -              echo >&2 "  $label_: $newshort_"
 -              git-update-ref -m "$GIT_REFLOG_ACTION: storing tag" "$1" "$2"
 -      fi
 -      ;;
 -
 -    refs/heads/* | refs/remotes/*)
 -      # $1 is the ref being updated.
 -      # $2 is the new value for the ref.
 -      local=$(git-rev-parse --verify "$1^0" 2>/dev/null)
 -      if test "$local"
 -      then
 -          # Require fast-forward.
 -          mb=$(git-merge-base "$local" "$2") &&
 -          case "$2,$mb" in
 -          $local,*)
 -              if test -n "$verbose"
 -              then
 -                      echo >&2 "* $1: same as $3"
 -                      echo >&2 "  $label_: $newshort_"
 -              fi
 -              ;;
 -          *,$local)
 -              echo >&2 "* $1: fast forward to $3"
 -              echo >&2 "  old..new: $oldshort_..$newshort_"
 -              git-update-ref -m "$GIT_REFLOG_ACTION: fast-forward" "$1" "$2" "$local"
 -              ;;
 -          *)
 -              false
 -              ;;
 -          esac || {
 -              case ",$force,$single_force," in
 -              *,t,*)
 -                      echo >&2 "* $1: forcing update to non-fast forward $3"
 -                      echo >&2 "  old...new: $oldshort_...$newshort_"
 -                      git-update-ref -m "$GIT_REFLOG_ACTION: forced-update" "$1" "$2" "$local"
 -                      ;;
 -              *)
 -                      echo >&2 "* $1: not updating to non-fast forward $3"
 -                      echo >&2 "  old...new: $oldshort_...$newshort_"
 -                      exit 1
 -                      ;;
 -              esac
 -          }
 -      else
 -          echo >&2 "* $1: storing $3"
 -          echo >&2 "  $label_: $newshort_"
 -          git-update-ref -m "$GIT_REFLOG_ACTION: storing head" "$1" "$2"
 -      fi
 -      ;;
 -    esac
 +      flags=
 +      test -n "$verbose" && flags="$flags$LF-v"
 +      test -n "$force$single_force" && flags="$flags$LF-f"
 +      GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION" \
 +              git-fetch--tool $flags append-fetch-head "$@"
  }
  
  # updating the current HEAD with git-fetch in a bare
@@@ -157,40 -283,7 +161,40 @@@ the
        fi
  fi
  
 -fetch_main () {
 +fetch_all_at_once () {
 +
 +  eval=$(echo "$1" | git-fetch--tool parse-reflist "-")
 +  eval "$eval"
 +
 +    ( : subshell because we muck with IFS
 +      IFS="   $LF"
 +      (
 +      if test "$remote" = . ; then
 +          git-show-ref $rref || echo failed "$remote"
 +      elif test -f "$remote" ; then
 +          test -n "$shallow_depth" &&
 +              die "shallow clone with bundle is not supported"
 +          git-bundle unbundle "$remote" $rref ||
 +          echo failed "$remote"
 +      else
-         git-fetch-pack --thin $exec $keep $shallow_depth $no_progress \
-               "$remote" $rref ||
++        git-fetch-pack --thin $exec $keep $shallow_depth \
++            $quiet $no_progress "$remote" $rref ||
 +        echo failed "$remote"
 +      fi
 +      ) |
 +      (
 +      flags=
 +      test -n "$verbose" && flags="$flags -v"
 +      test -n "$force" && flags="$flags -f"
 +      GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION" \
 +              git-fetch--tool $flags native-store \
 +                      "$remote" "$remote_nick" "$refs"
 +      )
 +    ) || exit
 +
 +}
 +
 +fetch_per_ref () {
    reflist="$1"
    refs=
    rref=
@@@ -248,7 -341,8 +252,8 @@@
          expr "z$head" : "z$_x40\$" >/dev/null ||
                die "No such ref $remote_name at $remote"
          echo >&2 "Fetching $remote_name from $remote using $proto"
-         git-http-fetch -v -a "$head" "$remote" || exit
+         case "$quiet" in '') v=-v ;; *) v= ;; esac
 -        git-http-fetch $v -a "$head" "$remote/" || exit
++        git-http-fetch $v -a "$head" "$remote" || exit
          ;;
        rsync://*)
          test -n "$shallow_depth" &&
@@@ -257,8 -351,9 +262,9 @@@
          rsync -L -q "$remote/$remote_name" "$TMP_HEAD" || exit 1
          head=$(git-rev-parse --verify TMP_HEAD)
          rm -f "$TMP_HEAD"
+         case "$quiet" in '') v=-v ;; *) v= ;; esac
          test "$rsync_slurped_objects" || {
-             rsync -av --ignore-existing --exclude info \
+             rsync -a $v --ignore-existing --exclude info \
                  "$remote/objects/" "$GIT_OBJECT_DIRECTORY/" || exit
  
              # Look at objects/info/alternates for rsync -- http will
@@@ -282,6 -377,9 +288,6 @@@
              rsync_slurped_objects=t
          }
          ;;
 -      *)
 -        # We will do git native transport with just one call later.
 -        continue ;;
        esac
  
        append_fetch_head "$head" "$remote" \
@@@ -289,17 -387,80 +295,17 @@@
  
    done
  
 -  case "$remote" in
 -  http://* | https://* | ftp://* | rsync://* )
 -      ;; # we are already done.
 -  *)
 -    ( : subshell because we muck with IFS
 -      IFS="   $LF"
 -      (
 -      if test -f "$remote" ; then
 -          test -n "$shallow_depth" &&
 -              die "shallow clone with bundle is not supported"
 -          git-bundle unbundle "$remote" $rref ||
 -          echo failed "$remote"
 -      else
 -        git-fetch-pack --thin $exec $keep $shallow_depth \
 -            $quiet $no_progress "$remote" $rref ||
 -        echo failed "$remote"
 -      fi
 -      ) |
 -      (
 -      trap '
 -              if test -n "$keepfile" && test -f "$keepfile"
 -              then
 -                      rm -f "$keepfile"
 -              fi
 -      ' 0
 -
 -        keepfile=
 -      while read sha1 remote_name
 -      do
 -        case "$sha1" in
 -        failed)
 -                echo >&2 "Fetch failure: $remote"
 -                exit 1 ;;
 -        # special line coming from index-pack with the pack name
 -        pack)
 -                continue ;;
 -        keep)
 -                keepfile="$GIT_OBJECT_DIRECTORY/pack/pack-$remote_name.keep"
 -                continue ;;
 -        esac
 -        found=
 -        single_force=
 -        for ref in $refs
 -        do
 -            case "$ref" in
 -            +$remote_name:*)
 -                single_force=t
 -                not_for_merge=
 -                found="$ref"
 -                break ;;
 -            .+$remote_name:*)
 -                single_force=t
 -                not_for_merge=t
 -                found="$ref"
 -                break ;;
 -            .$remote_name:*)
 -                not_for_merge=t
 -                found="$ref"
 -                break ;;
 -            $remote_name:*)
 -                not_for_merge=
 -                found="$ref"
 -                break ;;
 -            esac
 -        done
 -        local_name=$(expr "z$found" : 'z[^:]*:\(.*\)')
 -        append_fetch_head "$sha1" "$remote" \
 -                "$remote_name" "$remote_nick" "$local_name" \
 -                "$not_for_merge" || exit
 -        done
 -      )
 -    ) || exit ;;
 -  esac
 +}
  
 +fetch_main () {
 +      case "$remote" in
 +      http://* | https://* | ftp://* | rsync://* )
 +              fetch_per_ref "$@"
 +              ;;
 +      *)
 +              fetch_all_at_once "$@"
 +              ;;
 +      esac
  }
  
  fetch_main "$reflist" || exit