summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuncer Ayaz <tuncer.ayaz@gmail.com>2008-10-05 13:53:00 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-10-06 07:01:07 (GMT)
commitfe8aa148b2cba66fb2643e4df1670c132da5d706 (patch)
tree10265f464a01141938bb03788074a79ee1413af7
parent5209ac4de4192e4ffcd72861517daccf387391e5 (diff)
downloadgit-fe8aa148b2cba66fb2643e4df1670c132da5d706.zip
git-fe8aa148b2cba66fb2643e4df1670c132da5d706.tar.gz
git-fe8aa148b2cba66fb2643e4df1670c132da5d706.tar.bz2
Fix fetch/clone --quiet when stdout is connected
Fixes the `git clone --quiet` issue raised by Dave Jones in http://marc.info/?l=git&m=121529226023180&w=2 With this simple patch applied we no longer see the following remote messages as no-progress is correctly sent to the remote site: remote: Counting objects: 84102, done. remote: Compressing objects: 100% (24720/24720), done. remote: Total 84102 (delta 60949), reused 80810 (delta 57900) Signed-off-by: Tuncer Ayaz <tuncer.ayaz@gmail.com> Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--transport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/transport.c b/transport.c
index 71433d9..35cac44 100644
--- a/transport.c
+++ b/transport.c
@@ -643,8 +643,8 @@ static int fetch_refs_via_pack(struct transport *transport,
args.use_thin_pack = data->thin;
args.include_tag = data->followtags;
args.verbose = (transport->verbose > 0);
- args.quiet = args.no_progress = (transport->verbose < 0);
- args.no_progress = !isatty(1);
+ args.quiet = (transport->verbose < 0);
+ args.no_progress = args.quiet || !isatty(1);
args.depth = data->depth;
for (i = 0; i < nr_heads; i++)