kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

pack-objects: parse --filter directly into revs.filter 

The previous change moved the 'revs' variable into cmd_pack_objects()
and now we can remove the global filter_options in favor of revs.filter.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Derrick Stolee 2022-03-22 17:28:37 +00:00 committed by Junio C Hamano
parent 80f6de4f5b
commit 831ee253b7
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/pack-objects.c
View File

@ -237,8 +237,6 @@ static unsigned long cache_max_small_delta_size = 1000;


static unsigned long window_memory_limit = 0; static unsigned long window_memory_limit = 0;


static struct list_objects_filter_options filter_options;

static struct string_list uri_protocols = STRING_LIST_INIT_NODUP; static struct string_list uri_protocols = STRING_LIST_INIT_NODUP;


enum missing_action { enum missing_action {
@ -3723,10 +3721,8 @@ static void get_object_list(struct rev_info *revs, int ac, const char **av)
int flags = 0; int flags = 0;
int save_warning; int save_warning;


repo_init_revisions(the_repository, revs, NULL);
save_commit_buffer = 0; save_commit_buffer = 0;
setup_revisions(ac, av, revs, &s_r_opt); setup_revisions(ac, av, revs, &s_r_opt);
list_objects_filter_copy(&revs->filter, &filter_options);


/* make sure shallows are read */ /* make sure shallows are read */
is_repository_shallow(the_repository); is_repository_shallow(the_repository);
@ -3958,7 +3954,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
&write_bitmap_index, &write_bitmap_index,
N_("write a bitmap index if possible"), N_("write a bitmap index if possible"),
WRITE_BITMAP_QUIET, PARSE_OPT_HIDDEN), WRITE_BITMAP_QUIET, PARSE_OPT_HIDDEN),
OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options), OPT_PARSE_LIST_OBJECTS_FILTER(&revs.filter),
OPT_CALLBACK_F(0, "missing", NULL, N_("action"), OPT_CALLBACK_F(0, "missing", NULL, N_("action"),
N_("handling for missing objects"), PARSE_OPT_NONEG, N_("handling for missing objects"), PARSE_OPT_NONEG,
option_parse_missing_action), option_parse_missing_action),
@ -4080,7 +4076,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
if (!rev_list_all || !rev_list_reflog || !rev_list_index) if (!rev_list_all || !rev_list_reflog || !rev_list_index)
unpack_unreachable_expiration = 0; unpack_unreachable_expiration = 0;


if (filter_options.choice) { if (revs.filter.choice) {
if (!pack_to_stdout) if (!pack_to_stdout)
die(_("cannot use --filter without --stdout")); die(_("cannot use --filter without --stdout"));
if (stdin_packs) if (stdin_packs)