mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ew/connect-verbose'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2016-02-10 14:20:07 -08:00
parent 0e35fcb412 f3ee9ca53b
commit fbf4bdfbf1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
transport.c
View File

@ -481,9 +481,10 @@ static int set_git_option(struct git_transport_options *opts,
return 1; 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; struct git_transport_data *data = transport->data;
int flags = transport->verbose > 0 ? CONNECT_VERBOSE : 0;
if (data->conn) if (data->conn)
return 0; 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, data->conn = git_connect(data->fd, transport->url,
for_push ? data->options.receivepack : for_push ? data->options.receivepack :
data->options.uploadpack, data->options.uploadpack,
verbose ? CONNECT_VERBOSE : 0); flags);
return 0; 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 git_transport_data *data = transport->data;
struct ref *refs; struct ref *refs;
connect_setup(transport, for_push, 0); connect_setup(transport, for_push);
get_remote_heads(data->fd[0], NULL, 0, &refs, get_remote_heads(data->fd[0], NULL, 0, &refs,
for_push ? REF_NORMAL : 0, for_push ? REF_NORMAL : 0,
&data->extra_have, &data->extra_have,
@ -536,7 +537,7 @@ static int fetch_refs_via_pack(struct transport *transport,
args.update_shallow = data->options.update_shallow; args.update_shallow = data->options.update_shallow;
if (!data->got_remote_heads) { 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, get_remote_heads(data->fd[0], NULL, 0, &refs_tmp, 0,
NULL, &data->shallow); NULL, &data->shallow);
data->got_remote_heads = 1; 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) { if (!data->got_remote_heads) {
struct ref *tmp_refs; 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, get_remote_heads(data->fd[0], NULL, 0, &tmp_refs, REF_NORMAL,
NULL, &data->shallow); NULL, &data->shallow);