Ramkumar Ramachandra wrote:
> +++ b/builtin/fmt-merge-msg.c
> @@ -7,11 +7,10 @@
> #include "string-list.h"
>
> static const char * const fmt_merge_msg_usage[] = {
> - "git fmt-merge-msg [-m <message>] [--log|--no-log] [--file <file>]",
> + "git fmt-merge-msg [-m <message>] [--log=[<n>]|--no-log] [--file <file>]",
[--log[=<n>]], no?
> NULL
> };
>
> -static int merge_summary;
> static int log_limit = 0;
Ah, so you elminate the boolean arg here. :)
Nit: the usual style in git is to let statics and globals that should
be 0 be implicitly initialized.
> @@ -328,10 +326,12 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
> const char *inpath = NULL;
> const char *message = NULL;
> struct option options[] = {
> - OPT_BOOLEAN(0, "log", &merge_summary, "populate log with the shortlog"),
> - { OPTION_BOOLEAN, 0, "summary", &merge_summary, NULL,
> + { OPTION_INTEGER, 0, "log", &log_limit, "n",
> + "populate log with <n> entries from shortlog",
> + PARSE_OPT_NOARG, NULL, 20 },
> + { OPTION_INTEGER, 0, "summary", &log_limit, "n",
> "alias for --log (deprecated)",
> - PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
> + PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 20 },
OPTARG, I think.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html