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 /transport-helper.c | |
| parent | 5bd631b3688e93ddedb33d4087deb91e2aae9e8e (diff) | |
| download | git-d01b3c02e8a066054c308ee2ce521a2ea44738d3.tar.gz git-d01b3c02e8a066054c308ee2ce521a2ea44738d3.tar.xz | |
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 'transport-helper.c')
| -rw-r--r-- | transport-helper.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/transport-helper.c b/transport-helper.c index 3d33697a4..3e69ebd18 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -279,9 +279,8 @@ static void standard_options(struct transport *t) char buf[16]; int n; int v = t->verbose; - int no_progress = v < 0 || (!t->progress && !isatty(2)); - set_helper_option(t, "progress", !no_progress ? "true" : "false"); + set_helper_option(t, "progress", t->progress ? "true" : "false"); n = snprintf(buf, sizeof(buf), "%d", v + 1); if (n >= sizeof(buf)) |