diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-02-10 22:20:07 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-10 22:20:07 (GMT) |
commit | fbf4bdfbf1ce543818363e7bc9286d73a61c0648 (patch) | |
tree | 3afd152f1da3c0cec7dd523b69fa1f00ef95b8b0 | |
parent | 0e35fcb412965f855e5ac6f469343e2f8e28d5ae (diff) | |
parent | f3ee9ca53bc04e9770747ea58951135d60b11a8d (diff) | |
download | git-fbf4bdfbf1ce543818363e7bc9286d73a61c0648.zip git-fbf4bdfbf1ce543818363e7bc9286d73a61c0648.tar.gz git-fbf4bdfbf1ce543818363e7bc9286d73a61c0648.tar.bz2 |
Merge branch 'ew/connect-verbose'
There were a few "now I am doing this thing" progress messages in
the TCP connection code that can be triggered by setting a verbose
option internally in the code, but "git fetch -v" and friends never
passed the verbose option down to that codepath.
There was a brief discussion about the impact on the end-user
experience by not limiting this to "fetch -v -v", but I think the
conclusion is that this is OK to enable with a single "-v" as it is
not too noisy.
* ew/connect-verbose:
pass transport verbosity down to git_connect
-rw-r--r-- | transport.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/transport.c b/transport.c index 67f3666..9ae7184 100644 --- a/transport.c +++ b/transport.c @@ -481,9 +481,10 @@ static int set_git_option(struct git_transport_options *opts, return 1; } -static int connect_setup(struct transport *transport, int for_push, int verbose) +static int connect_setup(struct transport *transport, int for_push) { struct git_transport_data *data = transport->data; + int flags = transport->verbose > 0 ? CONNECT_VERBOSE : 0; if (data->conn) return 0; @@ -491,7 +492,7 @@ static int connect_setup(struct transport *transport, int for_push, int verbose) data->conn = git_connect(data->fd, transport->url, for_push ? data->options.receivepack : data->options.uploadpack, - verbose ? CONNECT_VERBOSE : 0); + flags); return 0; } @@ -501,7 +502,7 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus struct git_transport_data *data = transport->data; struct ref *refs; - connect_setup(transport, for_push, 0); + connect_setup(transport, for_push); get_remote_heads(data->fd[0], NULL, 0, &refs, for_push ? REF_NORMAL : 0, &data->extra_have, @@ -536,7 +537,7 @@ static int fetch_refs_via_pack(struct transport *transport, args.update_shallow = data->options.update_shallow; if (!data->got_remote_heads) { - connect_setup(transport, 0, 0); + connect_setup(transport, 0); get_remote_heads(data->fd[0], NULL, 0, &refs_tmp, 0, NULL, &data->shallow); data->got_remote_heads = 1; @@ -812,7 +813,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re if (!data->got_remote_heads) { struct ref *tmp_refs; - connect_setup(transport, 1, 0); + connect_setup(transport, 1); get_remote_heads(data->fd[0], NULL, 0, &tmp_refs, REF_NORMAL, NULL, &data->shallow); |