kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

commit, tag: parse --trailer with OPT_STRVEC 

Now that amend_file_with_trailers() expects raw trailer lines, do not
store argv-style "--trailer=<trailer>" strings in git commit and git
tag.

Parse --trailer using OPT_STRVEC so trailer_args contains only the
trailer value, and drop the temporary prefix stripping in
amend_file_with_trailers().

Signed-off-by: Li Chen <me@linux.beauty>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Li Chen 2026-03-06 14:53:31 +00:00 committed by Junio C Hamano
parent 6b2243fdd4
commit 5e148696bf
4 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/commit.c
View File

@ -1720,7 +1720,8 @@ int cmd_commit(int argc,
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, "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_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_BOOL(0, "reset-author", &renew_authorship, N_("the commit is authored by me now (used with -C/-c/--amend)")),
OPT_PASSTHRU_ARGV(0, "trailer", &trailer_args, N_("trailer"), N_("add custom trailer(s)"), PARSE_OPT_NONEG), OPT_STRVEC(0, "trailer", &trailer_args, N_("trailer"),
N_("add custom trailer(s)")),
OPT_BOOL('s', "signoff", &signoff, N_("add a Signed-off-by trailer")), OPT_BOOL('s', "signoff", &signoff, N_("add a Signed-off-by trailer")),
OPT_FILENAME('t', "template", &template_file, N_("use specified template file")), OPT_FILENAME('t', "template", &template_file, N_("use specified template file")),
OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")), OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),

4
builtin/tag.c
View File

@ -499,8 +499,8 @@ int cmd_tag(int argc,
OPT_CALLBACK_F('m', "message", &msg, N_("message"), OPT_CALLBACK_F('m', "message", &msg, N_("message"),
N_("tag message"), PARSE_OPT_NONEG, parse_msg_arg), N_("tag message"), PARSE_OPT_NONEG, parse_msg_arg),
OPT_FILENAME('F', "file", &msgfile, N_("read message from file")), OPT_FILENAME('F', "file", &msgfile, N_("read message from file")),
OPT_PASSTHRU_ARGV(0, "trailer", &trailer_args, N_("trailer"), OPT_STRVEC(0, "trailer", &trailer_args, N_("trailer"),
N_("add custom trailer(s)"), PARSE_OPT_NONEG), N_("add custom trailer(s)")),
OPT_BOOL('e', "edit", &edit_flag, N_("force edit of tag message")), OPT_BOOL('e', "edit", &edit_flag, N_("force edit of tag message")),
OPT_BOOL('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")), OPT_BOOL('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")),
OPT_CLEANUP(&cleanup_arg), OPT_CLEANUP(&cleanup_arg),

25
trailer.c
View File

@ -1341,46 +1341,25 @@ int amend_file_with_trailers(const char *path,
const struct strvec *trailer_args) const struct strvec *trailer_args)
{ {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct strvec stripped_trailer_args = STRVEC_INIT;
int ret = 0; int ret = 0;
size_t i;


if (!trailer_args) if (!trailer_args)
BUG("amend_file_with_trailers called with NULL trailer_args"); BUG("amend_file_with_trailers called with NULL trailer_args");
if (!trailer_args->nr) if (!trailer_args->nr)
return 0; return 0;


for (i = 0; i < trailer_args->nr; i++) { if (validate_trailer_args(trailer_args)) {
const char *txt = trailer_args->v[i];

/*
* Historically amend_file_with_trailers() passed its arguments
* to "git interpret-trailers", which expected argv entries in
* "--trailer=<trailer>" form. Continue to accept those for
* existing callers, but pass only the value portion to the
* in-process implementation.
*/
skip_prefix(txt, "--trailer=", &txt);
if (!*txt) {
ret = error(_("empty --trailer argument"));
goto out;
}
strvec_push(&stripped_trailer_args, txt);
}

if (validate_trailer_args(&stripped_trailer_args)) {
ret = -1; ret = -1;
goto out; goto out;
} }
if (strbuf_read_file(&buf, path, 0) < 0) if (strbuf_read_file(&buf, path, 0) < 0)
ret = error_errno(_("could not read '%s'"), path); ret = error_errno(_("could not read '%s'"), path);
else else
amend_strbuf_with_trailers(&buf, &stripped_trailer_args); amend_strbuf_with_trailers(&buf, trailer_args);


if (!ret) if (!ret)
ret = write_file_in_place(path, &buf); ret = write_file_in_place(path, &buf);
out: out:
strvec_clear(&stripped_trailer_args);
strbuf_release(&buf); strbuf_release(&buf);
return ret; return ret;
} }

4
trailer.h
View File

@ -209,8 +209,8 @@ int amend_strbuf_with_trailers(struct strbuf *buf,
/* /*
* Augment a file by appending trailers specified in trailer_args. * Augment a file by appending trailers specified in trailer_args.
* *
* Each element of trailer_args should be an argv-style --trailer=<trailer> * Each element of trailer_args should be in the same format as the value
* option (i.e., including the --trailer= prefix). * accepted by --trailer=<trailer> (i.e., without the --trailer= prefix).
* *
* Returns 0 on success or a non-zero error code on failure. * Returns 0 on success or a non-zero error code on failure.
*/ */