diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-07-05 18:33:16 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-05 18:33:16 -0700 |
commit | 08b51f51e6a4cf2f5ad4b893707f1337a450e499 (patch) | |
tree | 1ff3a0c83f79c221194ac91ee6c2018d477ec7af /transport.c | |
parent | 1fc561d169ac08c411e34a4439894c5201b3d080 (diff) | |
parent | 9b373229506c9f563b2e2f053c3f1d932789fbfd (diff) | |
download | git-08b51f51e6a4cf2f5ad4b893707f1337a450e499.tar.gz |
Merge branch 'qq/maint'
* qq/maint:
clone -q: honor "quiet" option over native transports.
attribute documentation: keep EXAMPLE at end
builtin-commit.c: Use 'git_config_string' to get 'commit.template'
http.c: Use 'git_config_string' to clean up SSL config.
diff.c: Use 'git_config_string' to get 'diff.external'
convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'
Documentation cvs: Clarify when a bare repository is needed
Documentation: be precise about which date --pretty uses
Conflicts:
Documentation/gitattributes.txt
Diffstat (limited to 'transport.c')
-rw-r--r-- | transport.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/transport.c b/transport.c index 4145eed979..6eb65b873a 100644 --- a/transport.c +++ b/transport.c @@ -645,7 +645,9 @@ static int fetch_refs_via_pack(struct transport *transport, args.lock_pack = 1; args.use_thin_pack = data->thin; args.include_tag = data->followtags; - args.verbose = transport->verbose > 0; + args.verbose = (transport->verbose > 0); + args.quiet = args.no_progress = (transport->verbose < 0); + args.no_progress = !isatty(1); args.depth = data->depth; for (i = 0; i < nr_heads; i++) |