undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Junio C Hamano 2019-07-29 12:38:19 -07:00
commit e59150199c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/pack-objects.c
View File

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

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)

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,
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);