From: Jonathan Nieder <jrnieder@gmail.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Johannes Sixt <j.sixt@viscovery.net>,
Yaroslav Halchenko <debian@onerussian.com>,
Jakub Narebski <jnareb@gmail.com>
Subject: Re: [PATCH v3 3/5] fmt-merge-msg: Update command line options to sync with config options
Date: Fri, 20 Aug 2010 23:02:03 -0500 [thread overview]
Message-ID: <20100821040203.GA2636@burratino> (raw)
In-Reply-To: <1282331702-5115-4-git-send-email-artagnon@gmail.com>
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.
next prev parent reply other threads:[~2010-08-21 4:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-20 19:14 [PATCH v3 0/5] fmt-merge-msg improvements Ramkumar Ramachandra
2010-08-20 19:14 ` [PATCH v3 1/5] parse-options: Allow PARSE_OPT_NOARG in integer arguments Ramkumar Ramachandra
2010-08-20 19:49 ` Junio C Hamano
2010-08-20 20:01 ` Ramkumar Ramachandra
2010-08-21 3:39 ` Jonathan Nieder
2010-08-20 19:14 ` [PATCH v3 2/5] fmt-merge-msg: Make the number of log entries in commit message configurable Ramkumar Ramachandra
2010-08-21 3:54 ` Jonathan Nieder
2010-08-21 5:55 ` Ramkumar Ramachandra
2010-08-20 19:15 ` [PATCH v3 3/5] fmt-merge-msg: Update command line options to sync with config options Ramkumar Ramachandra
2010-08-21 4:02 ` Jonathan Nieder [this message]
2010-08-21 5:51 ` Ramkumar Ramachandra
2010-08-20 19:15 ` [PATCH v3 4/5] fmt-merge-msg: Remove deprecated --summary option Ramkumar Ramachandra
2010-08-21 4:04 ` Jonathan Nieder
2010-08-21 5:49 ` Ramkumar Ramachandra
2010-08-20 19:15 ` [PATCH v3 5/5] fmt-merge-msg: Update fmt-merge-msg and merge-config documentation Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100821040203.GA2636@burratino \
--to=jrnieder@gmail.com \
--cc=artagnon@gmail.com \
--cc=debian@onerussian.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=jnareb@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).