freshlybakedca.ke / git
Git fork
fork atom

pack-objects: use rev.filter when possible

In builtin/pack-objects.c, we use a 'filter_options' global to populate
the --filter=<X> argument. The previous change created a pointer to a
filter option in 'struct rev_info', so we can use that pointer here as a
start to simplifying some usage of object filters.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Derrick Stolee and committed by
Junio C Hamano 7940941d ffaa137f

+3 -2
unified split
+3 -2
builtin/pack-objects.c
··· 3651 3651 3652 3652 static int get_object_list_from_bitmap(struct rev_info *revs) 3653 3653 { 3654 - if (!(bitmap_git = prepare_bitmap_walk(revs, &filter_options, 0))) 3654 + if (!(bitmap_git = prepare_bitmap_walk(revs, &revs->filter, 0))) 3655 3655 return -1; 3656 3656 3657 3657 if (pack_options_allow_reuse() && ··· 3727 3727 repo_init_revisions(the_repository, &revs, NULL); 3728 3728 save_commit_buffer = 0; 3729 3729 setup_revisions(ac, av, &revs, &s_r_opt); 3730 + list_objects_filter_copy(&revs.filter, &filter_options); 3730 3731 3731 3732 /* make sure shallows are read */ 3732 3733 is_repository_shallow(the_repository); ··· 3777 3778 3778 3779 if (!fn_show_object) 3779 3780 fn_show_object = show_object; 3780 - traverse_commit_list_filtered(&filter_options, &revs, 3781 + traverse_commit_list_filtered(&revs.filter, &revs, 3781 3782 show_commit, fn_show_object, NULL, 3782 3783 NULL); 3783 3784