diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:40 -0700 |
| commit | cd9a57f6a040116f866ada47317c91262688a0ed (patch) | |
| tree | f38ff9174e532c5865d6888e9c6705df21a6ae41 /builtin | |
| parent | Merge branch 'dd/diff-files-unmerged-fix' into maint (diff) | |
| parent | checkout: make delayed checkout respect --quiet and --no-progress (diff) | |
| download | tgif-cd9a57f6a040116f866ada47317c91262688a0ed.tar.xz | |
Merge branch 'mt/quiet-with-delayed-checkout' into maint
The delayed checkout code path in "git checkout" etc. were chatty
even when --quiet and/or --no-progress options were given.
* mt/quiet-with-delayed-checkout:
checkout: make delayed checkout respect --quiet and --no-progress
Diffstat (limited to 'builtin')
| -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 b5d477919a..b23bc149d1 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) |