From: Jeff King Date: Thu, 31 Aug 2023 21:21:49 +0000 (-0400) Subject: parse-options: add more BUG_ON() annotations X-Git-Tag: v2.43.0-rc0~101^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abf2952f83f657ff40a731aa4b370350711029f4;p=thirdparty%2Fgit.git parse-options: add more BUG_ON() annotations These callbacks are similar to the ones touched by 517fe807d6 (assert NOARG/NONEG behavior of parse-options callbacks, 2018-11-05), but were either missed in that commit (the one in add.c) or were added later (the one in log.c). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/builtin/add.c b/builtin/add.c index 4b0dd798df..cf59108523 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -232,6 +232,8 @@ static char *chmod_arg; static int ignore_removal_cb(const struct option *opt, const char *arg, int unset) { + BUG_ON_OPT_ARG(arg); + /* if we are told to ignore, we are not adding removals */ *(int *)opt->value = !unset ? 0 : 1; return 0; diff --git a/builtin/log.c b/builtin/log.c index 3599063554..190e1952e9 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -121,6 +121,8 @@ static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP; static int clear_decorations_callback(const struct option *opt UNUSED, const char *arg, int unset) { + BUG_ON_OPT_NEG(unset); + BUG_ON_OPT_ARG(arg); string_list_clear(&decorate_refs_include, 0); string_list_clear(&decorate_refs_exclude, 0); use_default_decoration_filter = 0;