From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: peff@peff.net, chriscool@tuxfamily.org, gitster@pobox.com,
szeder.dev@gmail.com
Subject: [PATCH v3 3/4] upload-pack.c: pass 'struct list_objects_filter_options *'
Date: Fri, 31 Jul 2020 16:26:35 -0400 [thread overview]
Message-ID: <ad3f0cce56bf205ae718b0f3be46b91ef0285492.1596227003.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1596227003.git.me@ttaylorr.com>
The 'allows_filter_choice' function used to take an 'enum
list_objects_filter_choice', but in a future commit it will be more
convenient for it to accept the whole 'struct
list_objects_filter_options', for e.g., to inspect the value of
'->tree_exclude_depth'.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
upload-pack.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index ed2098edd0..5fa22da31f 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -991,9 +991,9 @@ static int process_deepen_not(const char *line, struct string_list *deepen_not,
}
static int allows_filter_choice(struct upload_pack_data *data,
- enum list_objects_filter_choice c)
+ struct list_objects_filter_options *opts)
{
- const char *key = list_object_filter_config_name(c);
+ const char *key = list_object_filter_config_name(opts->choice);
struct string_list_item *item = string_list_lookup(&data->allowed_filters,
key);
if (item)
@@ -1007,7 +1007,7 @@ static struct list_objects_filter_options *banned_filter(
{
size_t i;
- if (!allows_filter_choice(data, opts->choice))
+ if (!allows_filter_choice(data, opts))
return opts;
if (opts->choice == LOFC_COMBINE)
--
2.28.0.rc1.13.ge78abce653
next prev parent reply other threads:[~2020-07-31 20:27 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-23 1:48 [PATCH v2 0/4] upload-pack: custom allowed object filters Taylor Blau
2020-07-23 1:48 ` [PATCH v2 1/4] list_objects_filter_options: introduce 'list_object_filter_config_name' Taylor Blau
2020-07-23 1:49 ` [PATCH v2 2/4] upload-pack.c: allow banning certain object filter(s) Taylor Blau
2020-07-23 1:49 ` [PATCH v2 3/4] upload-pack.c: pass 'struct list_objects_filter_options *' Taylor Blau
2020-07-23 1:49 ` [PATCH v2 4/4] upload-pack.c: introduce 'uploadpackfilter.tree.maxDepth' Taylor Blau
2020-07-23 20:43 ` [PATCH v2 0/4] upload-pack: custom allowed object filters SZEDER Gábor
2020-07-24 16:51 ` Taylor Blau
2020-07-24 19:51 ` Jeff King
2020-07-27 14:25 ` Taylor Blau
2020-07-27 19:34 ` SZEDER Gábor
2020-07-27 19:36 ` Taylor Blau
2020-07-27 19:42 ` Jeff King
2020-07-27 19:59 ` SZEDER Gábor
2020-07-27 20:03 ` Taylor Blau
2020-07-31 20:26 ` [PATCH v3 " Taylor Blau
2020-07-31 20:26 ` [PATCH v3 1/4] list_objects_filter_options: introduce 'list_object_filter_config_name' Taylor Blau
2020-07-31 20:26 ` [PATCH v3 2/4] upload-pack.c: allow banning certain object filter(s) Taylor Blau
2020-07-31 20:54 ` Jeff King
2020-07-31 21:20 ` Taylor Blau
2020-07-31 20:26 ` Taylor Blau [this message]
2020-07-31 20:26 ` [PATCH v3 4/4] upload-pack.c: introduce 'uploadpackfilter.tree.maxDepth' Taylor Blau
2020-07-31 21:01 ` Jeff King
2020-07-31 21:22 ` Jeff King
2020-07-31 21:30 ` Taylor Blau
2020-07-31 21:29 ` Taylor Blau
2020-07-31 21:36 ` Jeff King
2020-07-31 21:43 ` Jeff King
2020-08-03 18:00 ` [PATCH v4 0/3] upload-pack: custom allowed object filters Taylor Blau
2020-08-03 18:00 ` [PATCH v4 2/3] upload-pack.c: allow banning certain object filter(s) Taylor Blau
2020-08-03 18:00 ` [PATCH v4 1/3] list_objects_filter_options: introduce 'list_object_filter_config_name' Taylor Blau
2020-08-03 18:00 ` [PATCH v4 3/3] upload-pack.c: introduce 'uploadpackfilter.tree.maxDepth' Taylor Blau
2020-08-04 0:37 ` [PATCH v4 0/3] upload-pack: custom allowed object filters Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ad3f0cce56bf205ae718b0f3be46b91ef0285492.1596227003.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).