undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore default verbosity for http fetches.

Browse Source 
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>
This commit is contained in:
Daniel Barkalow 2007-10-02 22:49:15 -04:00 committed by Junio C Hamano
parent cd547b4886
commit 2b5a06edca
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-fetch.c
View File

@ -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)

10
transport.c
View File

@ -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++)

2
transport.h
View File

@ -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