Merge branch 'zj/term-columns'

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 0e8560f60f43dd6e971a38381838d217bdc28899..7124c4b49cfba7985c5ba2046296f006de04e3bb 100644 (file)
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -737,7 +737,7 @@ static int get_pack(int xd[2], char **pack_lockfile)
        }
        else {
                *av++ = "unpack-objects";
-               if (args.quiet)
+               if (args.quiet || args.no_progress)
                        *av++ = "-q";
        }
        if (*hdr_arg)