Merge branch 'jk/delta-islands-progress-fix'

gitster · gitster · commit a4c8352e1e13 · 2019-07-09T15:25:43.000-07:00
The codepath to compute delta islands used to spew progress output
without giving the callers any way to squelch it, which has been
fixed.

* jk/delta-islands-progress-fix:
  delta-islands: respect progress flag
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
@@ -3134,7 +3134,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"));
diff --git 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)
diff --git a/delta-islands.h b/delta-islands.h
@@ -11,7 +11,7 @@ int in_same_island(const struct object_id *, const struct object_id *);
 void resolve_tree_islands(struct repository *r,
 			  int progress,
 			  struct packing_data *to_pack);
-void load_delta_islands(struct repository *r);
+void load_delta_islands(struct repository *r, int progress);
 void propagate_island_marks(struct commit *commit);
 int compute_pack_layers(struct packing_data *to_pack);
 

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ static void deduplicate_islands(struct repository *r)`
`454`	`454`	`free(list);`
`455`	`455`	`}`
`456`	`456`
`457`		`-void load_delta_islands(struct repository *r)`
	`457`	`+void load_delta_islands(struct repository *r, int progress)`
`458`	`458`	`{`
`459`	`459`	`island_marks = kh_init_sha1();`
`460`	`460`	`remote_islands = kh_init_str();`
`@@ -463,7 +463,8 @@ void load_delta_islands(struct repository *r)`
`463`	`463`	`for_each_ref(find_island_for_ref, NULL);`
`464`	`464`	`deduplicate_islands(r);`
`465`	`465`
`466`		`- fprintf(stderr, _("Marked %d islands, done.\n"), island_counter);`
	`466`	`+ if (progress)`
	`467`	`+ fprintf(stderr, _("Marked %d islands, done.\n"), island_counter);`
`467`	`468`	`}`
`468`	`469`
`469`	`470`	`void propagate_island_marks(struct commit *commit)`