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 /entry.h | |
parent | 225bc32a989d7a22fa6addafd4ce7dcd04675dbf (diff) |
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 'entry.h')
-rw-r--r-- | entry.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/entry.h b/entry.h index b8c0e170dc..7c889e58fd 100644 --- a/entry.h +++ b/entry.h @@ -43,7 +43,8 @@ static inline int checkout_entry(struct cache_entry *ce, } void enable_delayed_checkout(struct checkout *state); -int finish_delayed_checkout(struct checkout *state, int *nr_checkouts); +int finish_delayed_checkout(struct checkout *state, int *nr_checkouts, + int show_progress); /* * Unlink the last component and schedule the leading directories for |