From: Junio C Hamano <junkio@cox.net>
Date: Mon, 5 Mar 2007 01:31:21 +0000 (-0800)
Subject: Merge branch 'js/fetch-progress' (early part)
X-Git-Tag: v1.5.1-rc1~96
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ddad98b74924d76116d05e7601ab1e163d68500;p=git.git

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
---

3ddad98b74924d76116d05e7601ab1e163d68500
diff --cc git-fetch.sh
index 59bee5db0,851ed6b64..5ae0d28cc
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@@ -386,15 -379,9 +388,16 @@@ fetch_main () 
      ( : 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 "$remote" $rref ||
+ 	  git-fetch-pack --thin $exec $keep $shallow_depth $no_progress \
+ 		"$remote" $rref ||
  	  echo failed "$remote"
 +	fi
        ) |
        (
  	trap '