builtin/commit: use ARGV macro to collect trailers
Replace git-commit's callback for --trailer with the standard OPT_PASSTHRU_ARGV macro. The callback only adds its values to a strvec and sanity-checks that `unset` is always false; both of these are already implemented in the parse-option API. Signed-off-by: John Passaro <john.a.passaro@gmail.com> Acked-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Passaro committed
May 5, 2024 at 18:49 UTC
56740f9910218a03374b5e410b3a2d204d7c33ed
1 file changed
+1
-9
builtin/commit.c
+1
-9
@@ -142,14 +142,6 @@ static struct strbuf message = STRBUF_INIT;
142
143
static enum wt_status_format status_format = STATUS_FORMAT_UNSPECIFIED;
144
145
-static int opt_pass_trailer(const struct option *opt, const char *arg, int unset)
146
-{
147
- BUG_ON_OPT_NEG(unset);
148
-
149
- strvec_pushl(opt->value, "--trailer", arg, NULL);
150
- return 0;
151
-}
152
-
145
static int opt_parse_porcelain(const struct option *opt, const char *arg, int unset)
146
{
147
enum wt_status_format *value = (enum wt_status_format *)opt->value;
@@ -1673,7 +1665,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
1665
OPT_STRING(0, "fixup", &fixup_message, N_("[(amend|reword):]commit"), N_("use autosquash formatted message to fixup or amend/reword specified commit")),
1666
OPT_STRING(0, "squash", &squash_message, N_("commit"), N_("use autosquash formatted message to squash specified commit")),
1667
OPT_BOOL(0, "reset-author", &renew_authorship, N_("the commit is authored by me now (used with -C/-c/--amend)")),
1676
- OPT_CALLBACK_F(0, "trailer", &trailer_args, N_("trailer"), N_("add custom trailer(s)"), PARSE_OPT_NONEG, opt_pass_trailer),
1668
+ OPT_PASSTHRU_ARGV(0, "trailer", &trailer_args, N_("trailer"), N_("add custom trailer(s)"), PARSE_OPT_NONEG),
1669
OPT_BOOL('s', "signoff", &signoff, N_("add a Signed-off-by trailer")),
1670
OPT_FILENAME('t', "template", &template_file, N_("use specified template file")),
1671
OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),