Restore default verbosity for http fetches.

This adds a verbosity level below 0 for suppressing default messages
with --quiet, and makes the default for http be verbose instead of
quiet. This matches the behavior of the shell script version of git-fetch.

Signed-off-by: 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 ac68ff592eb10652fccdcf74f27763b1e2254f5e..cf7498b15fe91e2d138f384fa304c7f4e90f454d 100644 (file)
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -533,7 +533,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
        if (verbose >= 2)
                transport->verbose = 1;
        if (quiet)
-               transport->verbose = 0;
+               transport->verbose = -1;
        if (upload_pack)
                set_option(TRANS_OPT_UPLOADPACK, upload_pack);
        if (keep)

diff --git a/transport.c b/transport.c
index 7266fd3dc7ff376cacd9d958da8fd58bc70585b1..6fe6ec85031b849b569a2f3f11acca4c6c560f85 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -161,7 +161,7 @@ static struct ref *get_refs_via_rsync(const struct transport *transport)
        rsync.argv = args;
        rsync.stdout_to_stderr = 1;
        args[0] = "rsync";
-       args[1] = transport->verbose ? "-rv" : "-r";
+       args[1] = (transport->verbose > 0) ? "-rv" : "-r";
        args[2] = buf.buf;
        args[3] = temp_dir.buf;
        args[4] = NULL;
@@ -214,7 +214,7 @@ static int fetch_objs_via_rsync(struct transport *transport,
        rsync.argv = args;
        rsync.stdout_to_stderr = 1;
        args[0] = "rsync";
-       args[1] = transport->verbose ? "-rv" : "-r";
+       args[1] = (transport->verbose > 0) ? "-rv" : "-r";
        args[2] = "--ignore-existing";
        args[3] = "--exclude";
        args[4] = "info";
@@ -290,7 +290,7 @@ static int rsync_transport_push(struct transport *transport,
        rsync.argv = args;
        rsync.stdout_to_stderr = 1;
        args[0] = "rsync";
-       args[1] = transport->verbose ? "-av" : "-a";
+       args[1] = (transport->verbose > 0) ? "-av" : "-a";
        args[2] = "--ignore-existing";
        args[3] = "--exclude";
        args[4] = "info";
@@ -344,7 +344,7 @@ static int fetch_objs_via_walker(struct transport *transport,
        walker->get_all = 1;
        walker->get_tree = 1;
        walker->get_history = 1;
-       walker->get_verbosely = transport->verbose;
+       walker->get_verbosely = transport->verbose >= 0;
        walker->get_recover = 0;
 
        for (i = 0; i < nr_objs; i++)
@@ -637,7 +637,7 @@ static int fetch_refs_via_pack(struct transport *transport,
        args.keep_pack = data->keep;
        args.lock_pack = 1;
        args.use_thin_pack = data->thin;
-       args.verbose = transport->verbose;
+       args.verbose = transport->verbose > 0;
        args.depth = data->depth;
 
        for (i = 0; i < nr_heads; i++)

diff --git a/transport.h b/transport.h
index 6e318e4e8c7ff8e345fd54cacf70fa615cf1920a..4bb51d7b7f572b2f324e3ba8d1068bc4f5883b1d 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -24,7 +24,7 @@ struct transport {
 
        int (*disconnect)(struct transport *connection);
        char *pack_lockfile;
-       unsigned verbose : 1;
+       signed verbose : 2;
 };
 
 #define TRANSPORT_PUSH_ALL 1