diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:58:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:58:58 -0800 |
| commit | 42aac96763a72b5bac73d34640d3a0c6233027a6 (patch) | |
| tree | 8979b93510d3d1fe1334c72fc47c4f91c90b07f3 /builtin-clone.c | |
| parent | d0605072911a4c93a7eacf1fb55e79227c457e34 (diff) | |
| parent | 5a518ad4679c91f0d0afd38fcc3cbf04e8699c46 (diff) | |
| download | git-42aac96763a72b5bac73d34640d3a0c6233027a6.tar.gz git-42aac96763a72b5bac73d34640d3a0c6233027a6.tar.xz | |
Merge branch 'tc/clone-v-progress'
* tc/clone-v-progress:
clone: use --progress to force progress reporting
clone: set transport->verbose when -v/--verbose is used
git-clone.txt: reword description of progress behaviour
check stderr with isatty() instead of stdout when deciding to show progress
Conflicts:
transport.c
Diffstat (limited to 'builtin-clone.c')
| -rw-r--r-- | builtin-clone.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin-clone.c b/builtin-clone.c index 5df8b0f72..58bacbd55 100644 --- a/builtin-clone.c +++ b/builtin-clone.c @@ -44,10 +44,13 @@ static char *option_origin = NULL; static char *option_branch = NULL; static char *option_upload_pack = "git-upload-pack"; static int option_verbose; +static int option_progress; static struct option builtin_clone_options[] = { OPT__QUIET(&option_quiet), OPT__VERBOSE(&option_verbose), + OPT_BOOLEAN(0, "progress", &option_progress, + "force progress reporting"), OPT_BOOLEAN('n', "no-checkout", &option_no_checkout, "don't create a checkout"), OPT_BOOLEAN(0, "bare", &option_bare, "create a bare repository"), @@ -526,6 +529,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (option_quiet) transport->verbose = -1; else if (option_verbose) + transport->verbose = 1; + + if (option_progress) transport->progress = 1; if (option_upload_pack) |