Merge branch 'js/fetch-progress' (early part)

* 'js/fetch-progress' (early part):
  Fixup no-progress for fetch & clone
  fetch & clone: do not output progress when not on a tty

Conflicts:

	git-fetch.sh

diff --cc fetch-pack.c
Simple merge

diff --cc git-fetch.sh
index 59bee5db0f0738cd6d43772e7279edf726a0b7d1,851ed6b6466995ef36c02e88a3b1b161f4008471..5ae0d28cc09a0b3935262a542c9811b66eb5b85e
--- 1/git-fetch.sh
--- 2/git-fetch.sh
+++ b/git-fetch.sh
@@@ -386,15 -379,9 +388,16 @@@ fetch_main () 
      ( : subshell because we muck with IFS
        IFS="   $LF"
        (
-         git-fetch-pack --thin $exec $keep $shallow_depth "$remote" $rref ||
 +      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 $no_progress \
+               "$remote" $rref ||
          echo failed "$remote"
 +      fi
        ) |
        (
        trap '

diff --cc upload-pack.c
Simple merge