From: Junio C Hamano <junkio@cox.net>
Date: Mon, 9 Apr 2007 06:27:22 +0000 (-0700)
Subject: Merge branch 'js/fetch-progress'
X-Git-Tag: v1.5.2-rc0~70
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=27be481ffbbde9499b4203d26680cf21b4a7ec29;p=git.git

Merge branch 'js/fetch-progress'

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

27be481ffbbde9499b4203d26680cf21b4a7ec29
diff --cc git-fetch.sh
index fd70696b7,3aa117e32..b04bd553f
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@@ -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" &&