diff options
| author |  Tay Ray Chuan <rctay89@gmail.com> | 2009-12-26 01:12:06 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-12-28 18:49:19 -0800 |
| commit | 5a518ad4679c91f0d0afd38fcc3cbf04e8699c46 (patch) | |
| tree | d10718feef2c6910278b2595de81da1c2ecd0c77 | |
| parent | clone: set transport->verbose when -v/--verbose is used (diff) | |
| download | tgif-5a518ad4679c91f0d0afd38fcc3cbf04e8699c46.tar.xz | |
clone: use --progress to force progress reporting
Follow the argument convention of git-pack-objects, such that a
separate option (--preogress) is used to force progress reporting
instead of -v/--verbose.
-v/--verbose now does not force progress reporting. Make git-clone.txt
say so.
This should cover all the bases in 21188b1 (Implement git clone -v),
which implemented the option to force progress reporting.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-clone.txt | 3 | ||||
| -rw-r--r-- | builtin-clone.c | 8 | ||||
| -rwxr-xr-x | t/t5702-clone-options.sh | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index e722e6cfd2..f43c8b2c08 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -102,6 +102,9 @@ objects from the source repository into a pack in the cloned repository. --verbose:: -v:: + Run verbosely. + +--progress:: Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the diff --git a/builtin-clone.c b/builtin-clone.c index 2d8bf5120e..8ad2bd4699 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"), @@ -524,10 +527,11 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (option_quiet) transport->verbose = -1; - else if (option_verbose) { + else if (option_verbose) transport->verbose = 1; + + if (option_progress) transport->progress = 1; - } if (option_upload_pack) transport_set_option(transport, TRANS_OPT_UPLOADPACK, diff --git a/t/t5702-clone-options.sh b/t/t5702-clone-options.sh index 27825f5f31..02cb024723 100755 --- a/t/t5702-clone-options.sh +++ b/t/t5702-clone-options.sh @@ -27,7 +27,8 @@ test_expect_success 'redirected clone' ' ' test_expect_success 'redirected clone -v' ' - git clone -v "file://$(pwd)/parent" clone-redirected-v >out 2>err && + git clone --progress "file://$(pwd)/parent" clone-redirected-progress \ + >out 2>err && test -s err ' |