[PATCH 2/2] clone: treat "checking connectivity" like other progress
- From
Jeff King <peff@peff.net>
- Date
- Sep 18, 2013, 20:06 UTC
- Message-ID
- <20130918200650.GB731@sigill.intra.peff.net>
- In-Reply-To
- <20130918200152.GA17074@sigill.intra.peff.net>
When stderr does not point to a tty, we typically suppress "we are now in this phase" progress reporting (e.g., we ask the server not to send us "counting objects" and the like).
The new "checking connectivity" message is in the same vein, and should be suppressed. Since clone relies on the transport code to make the decision, we can simply sneak a peek at the "progress" field of the transport struct. That properly takes into account both the verbosity and progress options we were given, as well as the result of isatty().
Note that we do not set up that progress flag for a local clone, as we do not fetch using the transport at all. That's acceptable here, though, because we also do not perform a connectivity check in that case.
Signed-off-by: Jeff King <peff@peff.net> --- Though the last paragraph explains why this is OK, it feels a bit fragile. I wonder if we should hoist the call to transport_set_verbosity outside the "!is_local" conditional. I do not think it would hurt anything.
builtin/clone.c | 4 ++-- t/t5702-clone-options.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c index 8723a3a..7c62298 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -550,12 +550,12 @@ static void update_remote_refs(const struct ref *refs, const struct ref *rm = mapped_refs; if (check_connectivity) { - if (0 <= option_verbosity) + if (transport->progress) fprintf(stderr, _("Checking connectivity... ")); if (check_everything_connected_with_transport(iterate_ref_map, 0, &rm, transport)) die(_("remote did not send all necessary objects")); - if (0 <= option_verbosity) + if (transport->progress) fprintf(stderr, _("done\n")); } diff --git a/t/t5702-clone-options.sh b/t/t5702-clone-options.sh index d3dbdfe..9e24ec8 100755 --- a/t/t5702-clone-options.sh +++ b/t/t5702-clone-options.sh @@ -22,7 +22,8 @@ test_expect_success 'redirected clone does not show progress' ' test_expect_success 'redirected clone does not show progress' ' git clone "file://$(pwd)/parent" clone-redirected >out 2>err && - ! grep % err + ! grep % err && + test_i18ngrep ! "Checking connectivity" err '
-- 1.8.4.rc4.16.g228394f