Merge fixes made on the 'master' front

[thirdparty/git.git] / delta-islands.c

diff --git a/delta-islands.c b/delta-islands.c
index 2186bd0738ed2fcbe216cf24a6c99ed4dc4ccd9b..b959f6c380a6f42849db570cf0a51fed23f2b2a8 100644 (file)
--- 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)