diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-23 14:37:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-04 10:02:46 -0700 |
| commit | 28ba96ab27d0471af101b4796534ad4085019db1 (patch) | |
| tree | 6c6ab12694492b11a177dbc92a8f901079b767e5 | |
| parent | test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+. (diff) | |
| download | tgif-28ba96ab27d0471af101b4796534ad4085019db1.tar.xz | |
clone: quell the progress report from init and report on clone
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/clone.c | 6 | ||||
| -rwxr-xr-x | t/t5601-clone.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 05f8fb4771..0bedde41f0 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 214756731b..678cee502d 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' ' |