Merge branch 'maint-1.6.0' into maint

diff --git a/transport.h b/transport.h
index d0b52053fff9bc463438674232bffb6024f3b1fc..6bbc1a82642ab9e5722cfe6ab34ec4246b3a9dd4 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -25,6 +25,8 @@ struct transport {
        int (*disconnect)(struct transport *connection);
        char *pack_lockfile;
        signed verbose : 2;
+       /* Force progress even if the output is not a tty */
+       unsigned progress : 1;
 };
 
 #define TRANSPORT_PUSH_ALL 1