X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=transport.c;h=181f8f24d14e91c106b1d36133292a7ee99333fb;hb=b476064544b9a64d062acc5e3c6be831ebb721cb;hp=c20267ce4f81053e4451b3502eef5e646abaf2d2;hpb=6ddba5e241ebe484d53e3573c72386f487e25697;p=git.git

diff --git a/transport.c b/transport.c
index c20267ce4..181f8f24d 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,