summaryrefslogtreecommitdiff
path: root/entry.h
diff options
context:
space:
mode:
authorMatheus Tavares <matheus.bernardino@usp.br>2021-08-26 19:10:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-08-27 06:15:33 (GMT)
commit7a132c628e57b9bceeb88832ea051395c0637b16 (patch)
tree4091c7cac1642aebc146a47af1b3894da10c7b75 /entry.h
parent225bc32a989d7a22fa6addafd4ce7dcd04675dbf (diff)
downloadgit-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 'entry.h')
-rw-r--r--entry.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/entry.h b/entry.h
index b8c0e17..7c889e5 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