Merge branch 'js/fetch-progress' (early part)
authorJunio C Hamano <junkio@cox.net>
Mon, 5 Mar 2007 01:31:21 +0000 (17:31 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 5 Mar 2007 01:31:21 +0000 (17:31 -0800)
* '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

1  2 
fetch-pack.c
git-fetch.sh
upload-pack.c

diff --cc fetch-pack.c
Simple merge
diff --cc 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