global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 01:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

delta-islands: respect progress flag

Browse Source 
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>
This commit is contained in:
Jeff King
2019-06-20 04:58:32 -04:00
committed by Junio C Hamano
parent aeb582a983
commit bdbdf42f8a
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
delta-islands.c
View File

@@ -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)