X-Git-Url: https://git.tokkee.org/?p=git.git;a=blobdiff_plain;f=transport.c;h=401b8dd35ce9acd88f38440fc52b908898119a81;hp=cac0c065ff9f82011b204f932932283b01a5d034;hb=a12c6b0149e3dadd0701dac4fd0ba2463d251650;hpb=1e2545c6878665f2092940eab1aaeb20703f7d14 diff --git a/transport.c b/transport.c index cac0c065f..401b8dd35 100644 --- a/transport.c +++ b/transport.c @@ -993,11 +993,15 @@ void transport_set_verbosity(struct transport *transport, int verbosity, * Rules used to determine whether to report progress (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. + * . Report progress, if force_progress is 1 (ie. --progress). + * . Don't report progress, if force_progress is 0 (ie. --no-progress). + * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ). + * . Report progress if isatty(2) is 1. **/ - transport->progress = force_progress || (verbosity >= 0 && isatty(2)); + if (force_progress >= 0) + transport->progress = !!force_progress; + else + transport->progress = verbosity >= 0 && isatty(2); } int transport_push(struct transport *transport,