summaryrefslogtreecommitdiff
path: root/builtin/pack-objects.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-06-20 08:58:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-20 20:29:49 (GMT)
commitbdbdf42f8ab79374704b769157e7b080d525b73a (patch)
treed27134e51d8f8cf314888ac1e6460a20b72b9684 /builtin/pack-objects.c
parentaeb582a98374c094361cba1bd756dc6307432c42 (diff)
downloadgit-bdbdf42f8ab79374704b769157e7b080d525b73a.zip
git-bdbdf42f8ab79374704b769157e7b080d525b73a.tar.gz
git-bdbdf42f8ab79374704b769157e7b080d525b73a.tar.bz2
delta-islands: respect progress flag
The delta island code always prints "Marked %d islands", even if progress has been suppressed with --no-progress or by sending stderr to a non-tty. Let's pass a progress boolean to load_delta_islands(). We already do the same thing for the progress meter in resolve_tree_islands(). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-objects.c')
-rw-r--r--builtin/pack-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a9fac7c..15f90af 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -3131,7 +3131,7 @@ static void get_object_list(int ac, const char **av)
return;
if (use_delta_islands)
- load_delta_islands(the_repository);
+ load_delta_islands(the_repository, progress);
if (prepare_revision_walk(&revs))
die(_("revision walk setup failed"));