From: Pierre Habouzit <madcoder@debian.org>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 1/3] parse-opt: migrate fmt-merge-msg.
Date: Thu, 02 Oct 2008 13:51:19 +0200 [thread overview]
Message-ID: <20081002115118.GC17334@artemis.corp> (raw)
In-Reply-To: <20081001145606.GX21310@spearce.org>
[-- Attachment #1: Type: text/plain, Size: 1283 bytes --]
On Wed, Oct 01, 2008 at 02:56:06PM +0000, Shawn O. Pearce wrote:
> Pierre Habouzit <madcoder@debian.org> wrote:
> > @@ -347,38 +349,32 @@ int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {
> >
> > int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
> > {
> > + const char *inpath = NULL;
> > + struct option options[] = {
> > + OPT_BOOLEAN(0, "log", &merge_summary, "populate log with the shortlog"),
> > + OPT_BOOLEAN(0, "summary", &merge_summary, "alias for --log"),
> > + OPT_STRING('F', "file", &inpath, "file", "file to read from"),
> > + OPT_END()
>
>
> > + argc = parse_options(argc, argv, options, fmt_merge_msg_usage, 0);
> > + if (argc > 0)
> > + usage_with_options(fmt_merge_msg_usage, options);
> > +
> > + if (!inpath || strcmp(inpath, "-"))
> > + in = stdin;
> > + else {
> > + fclose(in);
> > + in = fopen(argv[2], "r");
> > + if (!in)
> > + die("cannot open %s", argv[2]);
>
> Really argv[2]? Shouldn't that be inpath?
oh crap you're right. I'll submit and updated series soon... *sigh*
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-10-02 11:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-28 9:45 small warm-up: easy parse-opt migrations Pierre Habouzit
2008-09-28 9:45 ` [PATCH] parse-opt: migrate fmt-merge-msg Pierre Habouzit
2008-09-28 9:45 ` [PATCH] parse-opt: migrate git-merge-base Pierre Habouzit
2008-09-28 9:45 ` [PATCH] parse-opt: migrate builtin-merge-file Pierre Habouzit
2008-09-29 16:35 ` [PATCH] parse-opt: migrate fmt-merge-msg Shawn O. Pearce
2008-09-30 8:40 ` Pierre Habouzit
2008-09-30 19:10 ` Shawn O. Pearce
2008-09-30 21:16 ` Pierre Habouzit
2008-09-30 22:46 ` Shawn O. Pearce
2008-10-01 6:05 ` [PATCH 1/3] " Pierre Habouzit
2008-10-01 6:05 ` [PATCH 2/3] parse-opt: migrate git-merge-base Pierre Habouzit
2008-10-01 6:05 ` [PATCH 3/3] parse-opt: migrate builtin-merge-file Pierre Habouzit
2008-10-01 15:01 ` Shawn O. Pearce
2008-10-01 14:56 ` [PATCH 1/3] parse-opt: migrate fmt-merge-msg Shawn O. Pearce
2008-10-02 11:51 ` Pierre Habouzit [this message]
2008-10-02 12:59 ` [RESEND PATCH] " Pierre Habouzit
2008-10-02 12:59 ` [PATCH] parse-opt: migrate git-merge-base Pierre Habouzit
2008-10-02 12:59 ` [RESEND PATCH] parse-opt: migrate builtin-merge-file Pierre Habouzit
2008-09-28 13:20 ` small warm-up: easy parse-opt migrations Sverre Rabbelier
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=20081002115118.GC17334@artemis.corp \
--to=madcoder@debian.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.