Merge branch 'dl/xdiff'

diff --git a/transport.c b/transport.c
index cfb73500ec9058e7503787bd3c6de06aa3fed064..56831c57c5cf6500714c46c63581ca98662d58c3 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -642,7 +642,7 @@ static int fetch_refs_via_pack(struct transport *transport,
        args.include_tag = data->followtags;
        args.verbose = (transport->verbose > 0);
        args.quiet = (transport->verbose < 0);
-       args.no_progress = args.quiet || !isatty(1);
+       args.no_progress = args.quiet || (!transport->progress && !isatty(1));
        args.depth = data->depth;
 
        for (i = 0; i < nr_heads; i++)