@matheusbsbs / matheus-bagliano / commits / 2b5a06edca
Fork 0

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>

Daniel Barkalow committed Oct 2, 2007 at 22:49 UTC 2b5a06edca8f7237aad6464b349b79772024d2a2
3 files changed +7 -7
builtin-fetch.c
+1 -1
@@ -533,7 +533,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
533 if (verbose >= 2)
534 transport->verbose = 1;
535 if (quiet)
536 - transport->verbose = 0;
536 + transport->verbose = -1;
537 if (upload_pack)
538 set_option(TRANS_OPT_UPLOADPACK, upload_pack);
539 if (keep)
transport.c
+5 -5
@@ -161,7 +161,7 @@ static struct ref *get_refs_via_rsync(const struct transport *transport)
161 rsync.argv = args;
162 rsync.stdout_to_stderr = 1;
163 args[0] = "rsync";
164 - args[1] = transport->verbose ? "-rv" : "-r";
164 + args[1] = (transport->verbose > 0) ? "-rv" : "-r";
165 args[2] = buf.buf;
166 args[3] = temp_dir.buf;
167 args[4] = NULL;
@@ -214,7 +214,7 @@ static int fetch_objs_via_rsync(struct transport *transport,
214 rsync.argv = args;
215 rsync.stdout_to_stderr = 1;
216 args[0] = "rsync";
217 - args[1] = transport->verbose ? "-rv" : "-r";
217 + args[1] = (transport->verbose > 0) ? "-rv" : "-r";
218 args[2] = "--ignore-existing";
219 args[3] = "--exclude";
220 args[4] = "info";
@@ -290,7 +290,7 @@ static int rsync_transport_push(struct transport *transport,
290 rsync.argv = args;
291 rsync.stdout_to_stderr = 1;
292 args[0] = "rsync";
293 - args[1] = transport->verbose ? "-av" : "-a";
293 + args[1] = (transport->verbose > 0) ? "-av" : "-a";
294 args[2] = "--ignore-existing";
295 args[3] = "--exclude";
296 args[4] = "info";
@@ -344,7 +344,7 @@ static int fetch_objs_via_walker(struct transport *transport,
344 walker->get_all = 1;
345 walker->get_tree = 1;
346 walker->get_history = 1;
347 - walker->get_verbosely = transport->verbose;
347 + walker->get_verbosely = transport->verbose >= 0;
348 walker->get_recover = 0;
349
350 for (i = 0; i < nr_objs; i++)
@@ -637,7 +637,7 @@ static int fetch_refs_via_pack(struct transport *transport,
637 args.keep_pack = data->keep;
638 args.lock_pack = 1;
639 args.use_thin_pack = data->thin;
640 - args.verbose = transport->verbose;
640 + args.verbose = transport->verbose > 0;
641 args.depth = data->depth;
642
643 for (i = 0; i < nr_heads; i++)
transport.h
+1 -1
@@ -24,7 +24,7 @@ struct transport {
24
25 int (*disconnect)(struct transport *connection);
26 char *pack_lockfile;
27 - unsigned verbose : 1;
27 + signed verbose : 2;
28 };
29
30 #define TRANSPORT_PUSH_ALL 1