diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2010-02-24 20:50:26 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-24 08:35:44 -0800 |
| commit | d01b3c02e8a066054c308ee2ce521a2ea44738d3 (patch) | |
| tree | 75fb151e00c082a805a3cd067b3cc89f11359e45 /builtin-fetch.c | |
| parent | 5bd631b3688e93ddedb33d4087deb91e2aae9e8e (diff) | |
| download | git-d01b3c02e8a066054c308ee2ce521a2ea44738d3.tar.gz | |
transport->progress: use flag authoritatively
Set transport->progress in transport.c::transport_set_verbosity() after
checking for the appropriate conditions (eg. --progress, isatty(2)),
and thereafter use it without having to check again.
The rules used are as follows (processing aborts when a rule is
satisfied):
1. Report progress, if force_progress is 1 (ie. --progress).
2. Don't report progress, if verbosity < 0 (ie. -q/--quiet).
3. Report progress if isatty(2) is 1.
This changes progress reporting behaviour such that if both --progress
and --quiet are specified, progress is reported.
In two areas, the logic to determine whether to *not* show progress is
changed to simply use the negation of transport->progress. This changes
behaviour in some ways (see previous paragraph for details).
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-fetch.c')
| -rw-r--r-- | builtin-fetch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c index d23ea2a53e..6b96b41382 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -823,7 +823,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv) die("Where do you want to fetch from today?"); transport = transport_get(remote, NULL); - transport_set_verbosity(transport, verbosity); + transport_set_verbosity(transport, verbosity, 0); if (upload_pack) set_option(TRANS_OPT_UPLOADPACK, upload_pack); if (keep) |