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>
Derrick Stolee committed
Mar 9, 2022 at 16:01 UTC
7940941de1f23d02c60581cc90a193988e5e2fe0
1 file changed
+3
-2
builtin/pack-objects.c
+3
-2
@@ -3651,7 +3651,7 @@ static int pack_options_allow_reuse(void)
3651
3652
static int get_object_list_from_bitmap(struct rev_info *revs)
3653
{
3654
- if (!(bitmap_git = prepare_bitmap_walk(revs, &filter_options, 0)))
3654
+ if (!(bitmap_git = prepare_bitmap_walk(revs, &revs->filter, 0)))
3655
return -1;
3656
3657
if (pack_options_allow_reuse() &&
@@ -3727,6 +3727,7 @@ static void get_object_list(int ac, const char **av)
3727
repo_init_revisions(the_repository, &revs, NULL);
3728
save_commit_buffer = 0;
3729
setup_revisions(ac, av, &revs, &s_r_opt);
3730
+ list_objects_filter_copy(&revs.filter, &filter_options);
3731
3732
/* make sure shallows are read */
3733
is_repository_shallow(the_repository);
@@ -3777,7 +3778,7 @@ static void get_object_list(int ac, const char **av)
3778
3779
if (!fn_show_object)
3780
fn_show_object = show_object;
3780
- traverse_commit_list_filtered(&filter_options, &revs,
3781
+ traverse_commit_list_filtered(&revs.filter, &revs,
3782
show_commit, fn_show_object, NULL,
3783
NULL);
3784