diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:19 -0700 |
| commit | e59150199c063726d6613bf7b86d4c4dd8dfc1e6 (patch) | |
| tree | ce4fd7c2471f3dff436ef03cf022922c9fe93b48 | |
| parent | Merge branch 'sg/rebase-progress' into maint (diff) | |
| parent | delta-islands: respect progress flag (diff) | |
| download | tgif-e59150199c063726d6613bf7b86d4c4dd8dfc1e6.tar.xz | |
Merge branch 'jk/delta-islands-progress-fix' into maint
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
| -rw-r--r-- | builtin/pack-objects.c | 2 | ||||
| -rw-r--r-- | delta-islands.c | 5 | ||||
| -rw-r--r-- | delta-islands.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 41d7fc5983..787ae10288 100644 --- 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 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) diff --git a/delta-islands.h b/delta-islands.h index 3ac8045d8c..eb0f952629 100644 --- 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); |