diff options
| author | Matheus Tavares <matheus.bernardino@usp.br> | 2021-08-26 19:10:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-27 06:15:33 (GMT) |
| commit | 7a132c628e57b9bceeb88832ea051395c0637b16 (patch) | |
| tree | 4091c7cac1642aebc146a47af1b3894da10c7b75 /builtin/checkout.c | |
| parent | 225bc32a989d7a22fa6addafd4ce7dcd04675dbf (diff) | |
| download | git-7a132c628e57b9bceeb88832ea051395c0637b16.zip git-7a132c628e57b9bceeb88832ea051395c0637b16.tar.gz git-7a132c628e57b9bceeb88832ea051395c0637b16.tar.bz2 | |
checkout: make delayed checkout respect --quiet and --no-progress
The 'Filtering contents...' progress report from delayed checkout is
displayed even when checkout and clone are invoked with --quiet or
--no-progress. Furthermore, it is displayed unconditionally, without
first checking whether stdout is a tty. Let's fix these issues and also
add some regression tests for the two code paths that currently use
delayed checkout: unpack_trees.c:check_updates() and
builtin/checkout.c:checkout_worktree().
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index b5d4779..b23bc14 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -404,7 +404,7 @@ static int checkout_worktree(const struct checkout_opts *opts, mem_pool_discard(&ce_mem_pool, should_validate_cache_entries()); remove_marked_cache_entries(&the_index, 1); remove_scheduled_dirs(); - errs |= finish_delayed_checkout(&state, &nr_checkouts); + errs |= finish_delayed_checkout(&state, &nr_checkouts, opts->show_progress); if (opts->count_checkout_paths) { if (nr_unmerged) |