[v4,1/3] builtin/commit.c: remove bespoke option callback

Commit Message

John Passaro April 30, 2024, 2:41 p.m. UTC

From: John Passaro <[e-mail]>

Replace git-commit's bespoke callback for --trailer with the standard
OPT_PASSTHRU_ARGV macro. The bespoke callback was only adding its values
to a strvec and sanity-checking that `unset` is always false; both of
these are already implemented in the parse-option API.

Signed-off-by: John Passaro <[e-mail]>
---
 builtin/commit.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Comments

Patrick Steinhardt May 2, 2024, 6:27 a.m. UTC | #1

On Tue, Apr 30, 2024 at 02:41:49PM +0000, John Passaro via GitGitGadget wrote:
> From: John Passaro <[e-mail]>
> 
> Replace git-commit's bespoke callback for --trailer with the standard
> OPT_PASSTHRU_ARGV macro. The bespoke callback was only adding its values
> to a strvec and sanity-checking that `unset` is always false; both of
> these are already implemented in the parse-option API.

Nit: I feel like saying "bespoke" is a bit vague. I would have said
something like the following:

    builtin/commit: use ARGV option to collect custom trailers

In any case, I don't think this is a huge deal and not worth a reroll on
its own.

Patrick

Patch

diff --git a/builtin/commit.c b/builtin/commit.c
index 6e1484446b0..5a3248370db 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -142,14 +142,6 @@  static struct strbuf message = STRBUF_INIT;
 
 static enum wt_status_format status_format = STATUS_FORMAT_UNSPECIFIED;
 
-static int opt_pass_trailer(const struct option *opt, const char *arg, int unset)
-{
-	BUG_ON_OPT_NEG(unset);
-
-	strvec_pushl(opt->value, "--trailer", arg, NULL);
-	return 0;
-}
-
 static int opt_parse_porcelain(const struct option *opt, const char *arg, int unset)
 {
 	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)
 		OPT_STRING(0, "fixup", &fixup_message, N_("[(amend|reword):]commit"), N_("use autosquash formatted message to fixup or amend/reword specified commit")),
 		OPT_STRING(0, "squash", &squash_message, N_("commit"), N_("use autosquash formatted message to squash specified commit")),
 		OPT_BOOL(0, "reset-author", &renew_authorship, N_("the commit is authored by me now (used with -C/-c/--amend)")),
-		OPT_CALLBACK_F(0, "trailer", &trailer_args, N_("trailer"), N_("add custom trailer(s)"), PARSE_OPT_NONEG, opt_pass_trailer),
+		OPT_PASSTHRU_ARGV(0, "trailer", &trailer_args, N_("trailer"), N_("add custom trailer(s)"), PARSE_OPT_NONEG),
 		OPT_BOOL('s', "signoff", &signoff, N_("add a Signed-off-by trailer")),
 		OPT_FILENAME('t', "template", &template_file, N_("use specified template file")),
 		OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),