Merge branch 'jk/fix-ls-files-other'

[git.git] / transport.c

diff --git a/transport.c b/transport.c
index f7db5d91103c09a8cdc9bdbd27de4b0d4a15ea73..1c510a3360e26bc7cf622036574fe9d06c1aa6da 100644 (file)
--- 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 || (!transport->progress && !isatty(1));
        args.depth = data->depth;
 
        for (i = 0; i < nr_heads; i++)