Merge branch 'cb/transfer-no-progress'

* cb/transfer-no-progress: push/fetch/clone --no-progress suppresses progress output
2012-02-20 00:14:55 -08:00
parent 13dd790bbe 01fdc21f6e
commit 592d051759
7 changed files with 28 additions and 21 deletions
--- 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)