pass transport verbosity down to git_connect
While working in connect.c to perform non-blocking connections, I noticed calling "git fetch -v" was not causing the progress messages inside git_tcp_connect_sock to be emitted as I expected. Looking at history, it seems connect_setup has never been called with the verbose parameter. Since transport already has a "verbose" field, use that field instead of another parameter in connect_setup. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Wong committed
Jan 28, 2016 at 22:51 UTC
f3ee9ca53bc04e9770747ea58951135d60b11a8d
1 file changed
+6
-5
transport.c
+6
-5
@@ -481,9 +481,10 @@ static int set_git_option(struct git_transport_options *opts,
481
return 1;
482
}
483
484
-static int connect_setup(struct transport *transport, int for_push, int verbose)
484
+static int connect_setup(struct transport *transport, int for_push)
485
{
486
struct git_transport_data *data = transport->data;
487
+ int flags = transport->verbose > 0 ? CONNECT_VERBOSE : 0;
488
489
if (data->conn)
490
return 0;
@@ -491,7 +492,7 @@ static int connect_setup(struct transport *transport, int for_push, int verbose)
492
data->conn = git_connect(data->fd, transport->url,
493
for_push ? data->options.receivepack :
494
data->options.uploadpack,
494
- verbose ? CONNECT_VERBOSE : 0);
495
+ flags);
496
497
return 0;
498
}
@@ -501,7 +502,7 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
502
struct git_transport_data *data = transport->data;
503
struct ref *refs;
504
504
- connect_setup(transport, for_push, 0);
505
+ connect_setup(transport, for_push);
506
get_remote_heads(data->fd[0], NULL, 0, &refs,
507
for_push ? REF_NORMAL : 0,
508
&data->extra_have,
@@ -536,7 +537,7 @@ static int fetch_refs_via_pack(struct transport *transport,
537
args.update_shallow = data->options.update_shallow;
538
539
if (!data->got_remote_heads) {
539
- connect_setup(transport, 0, 0);
540
+ connect_setup(transport, 0);
541
get_remote_heads(data->fd[0], NULL, 0, &refs_tmp, 0,
542
NULL, &data->shallow);
543
data->got_remote_heads = 1;
@@ -812,7 +813,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
813
814
if (!data->got_remote_heads) {
815
struct ref *tmp_refs;
815
- connect_setup(transport, 1, 0);
816
+ connect_setup(transport, 1);
817
818
get_remote_heads(data->fd[0], NULL, 0, &tmp_refs, REF_NORMAL,
819
NULL, &data->shallow);