Message ID | d1780a0127a749902d60249b531869ee9cd1a5f6.1694125210.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 8c7d4acb075e0bcb8976d1802abc30a0fba52895 |
Headers | show |
Series | Fixes to trailer test script, help text, and documentation | expand |
"Linus Arver via GitGitGadget" <gitgitgadget@gmail.com> writes: > diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c > index a7623dbfb2e..5f3e1a38eee 100644 > --- a/builtin/interpret-trailers.c > +++ b/builtin/interpret-trailers.c > @@ -107,7 +107,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix) > OPT_BOOL(0, "only-trailers", &opts.only_trailers, N_("output only the trailers")), > OPT_BOOL(0, "only-input", &opts.only_input, N_("do not apply config rules")), > OPT_BOOL(0, "unfold", &opts.unfold, N_("join whitespace-continued values")), > - OPT_CALLBACK_F(0, "parse", &opts, NULL, N_("set parsing options"), > + OPT_CALLBACK_F(0, "parse", &opts, NULL, N_("alias for --only-trailers --only-input --unfold"), > PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_parse), > OPT_BOOL(0, "no-divider", &opts.no_divider, N_("do not treat \"---\" as the end of input")), > OPT_CALLBACK(0, "trailer", &trailers, N_("trailer"), Indeed, parse_opt_parse() sets the 3 options described in the commit message. Looks good.
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c index a7623dbfb2e..5f3e1a38eee 100644 --- a/builtin/interpret-trailers.c +++ b/builtin/interpret-trailers.c @@ -107,7 +107,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "only-trailers", &opts.only_trailers, N_("output only the trailers")), OPT_BOOL(0, "only-input", &opts.only_input, N_("do not apply config rules")), OPT_BOOL(0, "unfold", &opts.unfold, N_("join whitespace-continued values")), - OPT_CALLBACK_F(0, "parse", &opts, NULL, N_("set parsing options"), + OPT_CALLBACK_F(0, "parse", &opts, NULL, N_("alias for --only-trailers --only-input --unfold"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_parse), OPT_BOOL(0, "no-divider", &opts.no_divider, N_("do not treat \"---\" as the end of input")), OPT_CALLBACK(0, "trailer", &trailers, N_("trailer"),