From: "Shawn O. Pearce" <spearce@spearce.org>
To: Pierre Habouzit <madcoder@debian.org>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 3/3] parse-opt: migrate builtin-merge-file.
Date: Wed, 1 Oct 2008 08:01:59 -0700 [thread overview]
Message-ID: <20081001150159.GY21310@spearce.org> (raw)
In-Reply-To: <1222841106-26148-3-git-send-email-madcoder@debian.org>
Pierre Habouzit <madcoder@debian.org> wrote:
> diff --git a/builtin-merge-file.c b/builtin-merge-file.c
> index 45c9853..7736fe8 100644
> --- a/builtin-merge-file.c
> +++ b/builtin-merge-file.c
> @@ -2,21 +2,44 @@
...
> +static int label_cb(const struct option *opt, const char *arg, int unset)
> +{
> + static int label_count = 0;
> + const char **names = (const char **)opt->value;
> +
> + if (label_count >= 3)
> + return error("too many labels on the command like");
Typo on "command line".
--
Shawn.
next prev parent reply other threads:[~2008-10-01 15:03 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 [this message]
2008-10-01 14:56 ` [PATCH 1/3] parse-opt: migrate fmt-merge-msg Shawn O. Pearce
2008-10-02 11:51 ` Pierre Habouzit
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=20081001150159.GY21310@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=madcoder@debian.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 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).