diff options
| author | Jeff King <peff@peff.net> | 2019-06-20 10:58:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-20 22:29:49 +0200 |
| commit | bdbdf42f8ab79374704b769157e7b080d525b73a (patch) | |
| tree | d27134e51d8f8cf314888ac1e6460a20b72b9684 /delta-islands.c | |
| parent | mingw: allow building with an MSYS2 runtime v3.x (diff) | |
| download | git-bdbdf42f8ab79374704b769157e7b080d525b73a.tar.xz git-bdbdf42f8ab79374704b769157e7b080d525b73a.zip | |
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 'delta-islands.c')
| -rw-r--r-- | delta-islands.c | 5 |
1 files changed, 3 insertions, 2 deletions
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) |