diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-20 12:14:55 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-20 12:14:55 +0400 |
| commit | 592d051759f27ba6f5295423c8e13922081d79e1 (patch) | |
| tree | 7aad6f10decaa6fc849b3380bcd18c95223223ff /builtin/fetch.c | |
| parent | 13dd790bbe658e03e429d91b8babe3a284663d6e (diff) | |
| parent | 01fdc21f6e90f56fc5a49cbba751d9ead19b2f03 (diff) | |
Merge branch 'cb/transfer-no-progress'
* cb/transfer-no-progress:
push/fetch/clone --no-progress suppresses progress output
Diffstat (limited to 'builtin/fetch.c')
| -rw-r--r-- | builtin/fetch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index ab186332fa..65f5f9b72f 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -30,7 +30,7 @@ enum { }; static int all, append, dry_run, force, keep, multiple, prune, update_head_ok, verbosity; -static int progress, recurse_submodules = RECURSE_SUBMODULES_DEFAULT; +static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT; static int tags = TAGS_DEFAULT; static const char *depth; static const char *upload_pack; @@ -78,7 +78,7 @@ static struct option builtin_fetch_options[] = { OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"), OPT_BOOLEAN('u', "update-head-ok", &update_head_ok, "allow updating of HEAD ref"), - OPT_BOOLEAN(0, "progress", &progress, "force progress reporting"), + OPT_BOOL(0, "progress", &progress, "force progress reporting"), OPT_STRING(0, "depth", &depth, "depth", "deepen history of shallow clone"), { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, "dir", |