From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: peff@peff.net, chriscool@tuxfamily.org
Subject: [PATCH 3/4] upload-pack.c: pass 'struct list_objects_filter_options *'
Date: Thu, 2 Jul 2020 16:06:36 -0400 [thread overview]
Message-ID: <3434bd5979499899e24528c9a578288f1c8d2669.1593720075.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1593720075.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 a5f56d73cc..a014ae23a9 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -990,9 +990,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)
@@ -1006,7 +1006,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.27.0.225.g9fa765a71d
next prev parent reply other threads:[~2020-07-02 20:06 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-02 20:06 [PATCH 0/4] upload-pack: custom allowed object filters Taylor Blau
2020-07-02 20:06 ` [PATCH 1/4] list_objects_filter_options: introduce 'list_object_filter_config_name' Taylor Blau
2020-07-02 20:06 ` [PATCH 2/4] upload-pack.c: allow banning certain object filter(s) Taylor Blau
2020-07-08 8:45 ` Jeff King
2020-07-20 20:05 ` Taylor Blau
2020-07-15 10:00 ` SZEDER Gábor
2020-07-15 10:55 ` Jeff King
2020-07-20 20:07 ` Taylor Blau
2020-07-20 20:21 ` Jeff King
2020-07-22 9:17 ` SZEDER Gábor
2020-07-22 20:15 ` Taylor Blau
2020-07-23 1:41 ` Junio C Hamano
2020-07-23 1:50 ` Taylor Blau
2020-07-22 9:21 ` SZEDER Gábor
2020-07-22 20:16 ` Taylor Blau
2020-07-23 7:51 ` SZEDER Gábor
2020-07-23 14:13 ` Taylor Blau
2020-07-02 20:06 ` Taylor Blau [this message]
2020-07-02 20:06 ` [PATCH 4/4] upload-pack.c: introduce 'uploadpack.filter.tree.maxDepth' Taylor Blau
2020-07-15 10:11 ` SZEDER Gábor
2020-07-08 8:41 ` [PATCH 0/4] upload-pack: custom allowed object filters Jeff King
2020-07-20 20:09 ` Taylor Blau
2020-07-21 20:06 ` Junio C Hamano
2020-07-21 20:27 ` Taylor Blau
2020-07-21 22:05 ` Junio C Hamano
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=3434bd5979499899e24528c9a578288f1c8d2669.1593720075.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).