diff options
| author |  Matheus Tavares <matheus.bernardino@usp.br> | 2021-08-26 16:10:06 -0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-26 23:15:33 -0700 |
| commit | 7a132c628e57b9bceeb88832ea051395c0637b16 (patch) | |
| tree | 4091c7cac1642aebc146a47af1b3894da10c7b75 /unpack-trees.c | |
| parent | Git 2.33 (diff) | |
| download | tgif-7a132c628e57b9bceeb88832ea051395c0637b16.tar.xz | |
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 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 5786645f31..f07304f1b7 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -479,7 +479,7 @@ static int check_updates(struct unpack_trees_options *o, errs |= run_parallel_checkout(&state, pc_workers, pc_threshold, progress, &cnt); stop_progress(&progress); - errs |= finish_delayed_checkout(&state, NULL); + errs |= finish_delayed_checkout(&state, NULL, o->verbose_update); git_attr_set_direction(GIT_ATTR_CHECKIN); if (o->clone) |