[PATCH] clone: quell the progress report from init and report on clone
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Apr 23, 2010, 12:37 UTC
- Message-ID
- <35f1aab26b685ab5f124cfe1bf99b2d3a9fbaaa5.1272025319.git.git@drmicha.warpmail.net>
- In-Reply-To
- <1270386135.1675.1368217929@webmail.messagingengine.com>
From: Junio C Hamano <gitster@pobox.com>
Currently, a local git clone reports only initializing an empty git dir, which is potentially confusing.
Instead, report that cloning is in progress and when it is done (unless -q) is given, and suppress the init report.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- Basically this is your patch now, Junio, which is why it disappeared from my radar. But I don't think you applied it, so I'm resubmitting.
v2 shuts up init unconditionally (even with -v), as you preferred.
builtin/clone.c | 6 +++++- t/t5601-clone.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c index 05f8fb4..0bedde4 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -302,6 +302,8 @@ static const struct ref *clone_local(const char *src_repo, transport = transport_get(remote, src_repo); ret = transport_get_remote_refs(transport); transport_disconnect(transport); + if (0 <= option_verbosity) + printf("done.\n"); return ret; } @@ -461,7 +463,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix) die("could not create leading directories of '%s'", git_dir); set_git_dir(make_absolute_path(git_dir)); - init_db(option_template, (option_verbosity < 0) ? INIT_DB_QUIET : 0); + if (0 <= option_verbosity) + printf("Cloning into %s...\n", get_git_dir()); + init_db(option_template, INIT_DB_QUIET); /* * At this point, the config exists, so we do not need the diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 2147567..678cee5 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -34,7 +34,7 @@ test_expect_success 'clone with excess parameters (2)' ' test_expect_success 'output from clone' ' rm -fr dst && git clone -n "file://$(pwd)/src" dst >output && - test $(grep Initialized output | wc -l) = 1 + test $(grep Clon output | wc -l) = 1 ' test_expect_success 'clone does not keep pack' '
-- 1.7.1.rc1.248.gcefbb