[PATCH 09/13] tag: mark "--message" option with NONEG
- From
Jeff King <peff@peff.net>
- Date
- Nov 5, 2018, 06:43 UTC
- Message-ID
- <20181105064312.GI25864@sigill.intra.peff.net>
- In-Reply-To
- <20181105063718.GA24877@sigill.intra.peff.net>
We do not allow "--no-message" to work now, as the option callback returns "-1" when it sees a NULL arg. However, that will cause parse-options to exit(129) without printing anything further, leaving the user confused about what happened.
Instead, let's explicitly mark it as PARSE_OPT_NONEG, which will give a useful error message (and print the usual -h output).
In theory this could be used to override an earlier "-m", but it's not clear how it would interact with other message options (e.g., would it also clear data read for "-F"?). Since it's already disabled and nobody is asking for it, let's punt on that and just improve the error message.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/tag.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/tag.c b/builtin/tag.c index f623632186..6a396a5090 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -390,8 +390,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix) OPT_GROUP(N_("Tag creation options")), OPT_BOOL('a', "annotate", &annotate, N_("annotated tag, needs a message")), - OPT_CALLBACK('m', "message", &msg, N_("message"), - N_("tag message"), parse_msg_arg), + { OPTION_CALLBACK, 'm', "message", &msg, N_("message"), + N_("tag message"), PARSE_OPT_NONEG, parse_msg_arg }, OPT_FILENAME('F', "file", &msgfile, N_("read message from file")), OPT_BOOL('e', "edit", &edit_flag, N_("force edit of tag message")), OPT_BOOL('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")),
-- 2.19.1.1505.g9cd28186cf