From: "Eric W. Biederman" <ebiederm@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: <git@vger.kernel.org>, "brian m. carlson" <sandals@crustytoothpaste.net>
Subject: [PATCH] setup: Only allow extenions.objectFormat to be specified once
Date: Tue, 26 Sep 2023 11:01:00 -0500 [thread overview]
Message-ID: <87h6ngapqb.fsf@gmail.froward.int.ebiederm.org> (raw)
Today there is no sanity checking of what happens when
extensions.objectFormat is specified multiple times. Catch confused git
configurations by only allowing this option to be specified once.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
setup.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/setup.c b/setup.c
index 18927a847b86..ef9f79b8885e 100644
--- a/setup.c
+++ b/setup.c
@@ -580,6 +580,7 @@ static enum extension_result handle_extension(const char *var,
if (!strcmp(ext, "noop-v1")) {
return EXTENSION_OK;
} else if (!strcmp(ext, "objectformat")) {
+ struct string_list_item *item;
int format;
if (!value)
@@ -588,6 +589,13 @@ static enum extension_result handle_extension(const char *var,
if (format == GIT_HASH_UNKNOWN)
return error(_("invalid value for '%s': '%s'"),
"extensions.objectformat", value);
+ /* Only support objectFormat being specified once. */
+ for_each_string_list_item(item, &data->v1_only_extensions) {
+ if (!strcmp(item->string, "objectformat"))
+ return error(_("'%s' already specified as '%s'"),
+ "extensions.objectformat",
+ hash_algos[data->hash_algo].name);
+ }
data->hash_algo = format;
return EXTENSION_OK;
}
--
2.41.0
next reply other threads:[~2023-09-26 16:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 16:01 Eric W. Biederman [this message]
2023-09-26 21:37 ` [PATCH] setup: Only allow extenions.objectFormat to be specified once Junio C Hamano
2023-09-27 13:11 ` Eric W. Biederman
2023-09-27 19:56 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h6ngapqb.fsf@gmail.froward.int.ebiederm.org \
--to=ebiederm@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sandals@crustytoothpaste.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.