fetch: Allow transport -v -v -v to set verbosity to 3

Helpers might want a higher level of verbosity than just +1 (the
porcelain default setting) and +2 (-v -v).  Expand the field to
allow verbosity in the range -1..3.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
CC: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-fetch.c b/builtin-fetch.c
index cb48c57ca3e66b7ec39a98128b2cfb058c2dad15..52a9a42fa52948c1ab04a6965a3814d287949740 100644 (file)
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -665,7 +665,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 
        transport = transport_get(remote, remote->url[0]);
        if (verbosity >= 2)
 
        transport = transport_get(remote, remote->url[0]);
        if (verbosity >= 2)

-               transport->verbose = 1;
+               transport->verbose = verbosity <= 3 ? verbosity : 3;

        if (verbosity < 0)
                transport->verbose = -1;
        if (upload_pack)
        if (verbosity < 0)
                transport->verbose = -1;
        if (upload_pack)

diff --git a/transport.h b/transport.h
index c14da6f1e53ece9fa9ac2e68b73674c54329be5f..e4e6177e2632b4a764703c11ef0a8033eafea037 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -25,7 +25,7 @@ struct transport {
 
        int (*disconnect)(struct transport *connection);
        char *pack_lockfile;
 
        int (*disconnect)(struct transport *connection);
        char *pack_lockfile;

-       signed verbose : 2;
+       signed verbose : 3;

        /* Force progress even if the output is not a tty */
        unsigned progress : 1;
 };
        /* Force progress even if the output is not a tty */
        unsigned progress : 1;
 };