summaryrefslogtreecommitdiff
path: root/builtin/fetch-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-20 08:14:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-20 08:14:55 (GMT)
commit592d051759f27ba6f5295423c8e13922081d79e1 (patch)
tree7aad6f10decaa6fc849b3380bcd18c95223223ff /builtin/fetch-pack.c
parent13dd790bbe658e03e429d91b8babe3a284663d6e (diff)
parent01fdc21f6e90f56fc5a49cbba751d9ead19b2f03 (diff)
downloadgit-592d051759f27ba6f5295423c8e13922081d79e1.zip
git-592d051759f27ba6f5295423c8e13922081d79e1.tar.gz
git-592d051759f27ba6f5295423c8e13922081d79e1.tar.bz2
Merge branch 'cb/transfer-no-progress'
* cb/transfer-no-progress: push/fetch/clone --no-progress suppresses progress output
Diffstat (limited to 'builtin/fetch-pack.c')
-rw-r--r--builtin/fetch-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 0e8560f..7124c4b 100644
--- 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)