diff options
| author |  Tay Ray Chuan <rctay89@gmail.com> | 2010-02-24 20:50:23 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-02-24 08:35:44 -0800 |
| commit | bde873c52914b40377a12764cab926ee974c3f32 (patch) | |
| tree | 5eac44d9bbb54661c716a748bbd89af6fb9fe584 | |
| parent | Documentation/git-push: put --quiet before --verbose (diff) | |
| download | tgif-bde873c52914b40377a12764cab926ee974c3f32.tar.xz | |
fetch: refactor verbosity option handling into transport.[ch]
transport_set_verbosity() is now provided to transport users.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-fetch.c | 5 | ||||
| -rw-r--r-- | transport.c | 8 | ||||
| -rw-r--r-- | transport.h | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c index 8654fa7a2d..d23ea2a53e 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -823,10 +823,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv) die("Where do you want to fetch from today?"); transport = transport_get(remote, NULL); - if (verbosity >= 2) - transport->verbose = verbosity <= 3 ? verbosity : 3; - if (verbosity < 0) - transport->verbose = -1; + transport_set_verbosity(transport, verbosity); if (upload_pack) set_option(TRANS_OPT_UPLOADPACK, upload_pack); if (keep) diff --git a/transport.c b/transport.c index 3846aacb47..1632c4d0aa 100644 --- a/transport.c +++ b/transport.c @@ -1013,6 +1013,14 @@ int transport_set_option(struct transport *transport, return 1; } +void transport_set_verbosity(struct transport *transport, int verbosity) +{ + if (verbosity >= 2) + transport->verbose = verbosity <= 3 ? verbosity : 3; + if (verbosity < 0) + transport->verbose = -1; +} + int transport_push(struct transport *transport, int refspec_nr, const char **refspec, int flags, int *nonfastforward) diff --git a/transport.h b/transport.h index 7cea5cc723..7d1a0b6b36 100644 --- a/transport.h +++ b/transport.h @@ -122,6 +122,7 @@ struct transport *transport_get(struct remote *, const char *); **/ int transport_set_option(struct transport *transport, const char *name, const char *value); +void transport_set_verbosity(struct transport *transport, int verbosity); int transport_push(struct transport *connection, int refspec_nr, const char **refspec, int flags, |