diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:51:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:51:23 -0800 |
| commit | 905bf7742cf5f4a6dea2e75ba2dbd89d5dfaa793 (patch) | |
| tree | 4f6173217f109d96e31b47805c945222a7ee5171 /builtin-fetch.c | |
| parent | 7dacc6c0681203bb24b74c7b3318b1e6d5d16ee5 (diff) | |
| parent | 354870171bc98dfef7dfa037b3fe9ac9454c94a2 (diff) | |
| download | git-905bf7742cf5f4a6dea2e75ba2dbd89d5dfaa793.tar.gz | |
Merge branch 'sp/smart-http'
* sp/smart-http: (37 commits)
http-backend: Let gcc check the format of more printf-type functions.
http-backend: Fix access beyond end of string.
http-backend: Fix bad treatment of uintmax_t in Content-Length
t5551-http-fetch: Work around broken Accept header in libcurl
t5551-http-fetch: Work around some libcurl versions
http-backend: Protect GIT_PROJECT_ROOT from /../ requests
Git-aware CGI to provide dumb HTTP transport
http-backend: Test configuration options
http-backend: Use http.getanyfile to disable dumb HTTP serving
test smart http fetch and push
http tests: use /dumb/ URL prefix
set httpd port before sourcing lib-httpd
t5540-http-push: remove redundant fetches
Smart HTTP fetch: gzip requests
Smart fetch over HTTP: client side
Smart push over HTTP: client side
Discover refs via smart HTTP server when available
http-backend: more explict LocationMatch
http-backend: add example for gitweb on same URL
http-backend: use mod_alias instead of mod_rewrite
...
Conflicts:
.gitignore
remote-curl.c
Diffstat (limited to 'builtin-fetch.c')
| -rw-r--r-- | builtin-fetch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c index 2728860399..cd0bcf7140 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -717,7 +717,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) transport = transport_get(remote, remote->url[0]); if (verbosity >= 2) - transport->verbose = 1; + transport->verbose = verbosity <= 3 ? verbosity : 3; if (verbosity < 0) transport->verbose = -1; if (upload_pack) |