From bdbdf42f8ab79374704b769157e7b080d525b73a Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 20 Jun 2019 04:58:32 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- delta-islands.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'delta-islands.c') diff --git a/delta-islands.c b/delta-islands.c index 2186bd0738..b959f6c380 100644 --- a/delta-islands.c +++ b/delta-islands.c @@ -454,7 +454,7 @@ static void deduplicate_islands(struct repository *r) free(list); } -void load_delta_islands(struct repository *r) +void load_delta_islands(struct repository *r, int progress) { island_marks = kh_init_sha1(); remote_islands = kh_init_str(); @@ -463,7 +463,8 @@ void load_delta_islands(struct repository *r) for_each_ref(find_island_for_ref, NULL); deduplicate_islands(r); - fprintf(stderr, _("Marked %d islands, done.\n"), island_counter); + if (progress) + fprintf(stderr, _("Marked %d islands, done.\n"), island_counter); } void propagate_island_marks(struct commit *commit) -- cgit v1.2.1