mirrors/git
1
0
Fork 0
Code Issues Pull Requests 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

2
builtin/pack-objects.c
View File

@ -3131,7 +3131,7 @@ static void get_object_list(int ac, const char **av)
return; return;
if (use_delta_islands) if (use_delta_islands)
load_delta_islands(the_repository); load_delta_islands(the_repository, progress);
if (prepare_revision_walk(&revs)) if (prepare_revision_walk(&revs))
die(_("revision walk setup failed")); die(_("revision walk setup failed"));

5
delta-islands.c
View File

@ -454,7 +454,7 @@ static void deduplicate_islands(struct repository *r)
free(list); free(list);
} }
void load_delta_islands(struct repository *r) void load_delta_islands(struct repository *r, int progress)
{ {
island_marks = kh_init_sha1(); island_marks = kh_init_sha1();
remote_islands = kh_init_str(); remote_islands = kh_init_str();
@ -463,7 +463,8 @@ void load_delta_islands(struct repository *r)
for_each_ref(find_island_for_ref, NULL); for_each_ref(find_island_for_ref, NULL);
deduplicate_islands(r); 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) void propagate_island_marks(struct commit *commit)

2
delta-islands.h
View File

@ -11,7 +11,7 @@ int in_same_island(const struct object_id *, const struct object_id *);
void resolve_tree_islands(struct repository *r, void resolve_tree_islands(struct repository *r,
int progress, int progress,
struct packing_data *to_pack); 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); void propagate_island_marks(struct commit *commit);
int compute_pack_layers(struct packing_data *to_pack); int compute_pack_layers(struct packing_data *to_pack);