git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 3/3] parse-opt: migrate builtin-merge-file.

From
Shawn O. Pearce <spearce@spearce.org>
Date
Oct 1, 2008, 15:01 UTC
Message-ID
<20081001150159.GY21310@spearce.org>
In-Reply-To
<1222841106-26148-3-git-send-email-madcoder@debian.org>
Pierre Habouzit <madcoder@debian.org> wrote:
Show 5 quoted lines
> 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 @@
...
Show 7 quoted lines
> +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.
Previous: Pierre HabouzitNext: Shawn O. Pearce
Message 13 of 19 in “small warm-up: easy parse-opt migrations.”
  1. Pierre HabouzitSep 28, 2008
  2. parse-opt: migrate fmt-merge-msg.Pierre Habouzit, Sep 28, 2008
  3. parse-opt: migrate git-merge-base.Pierre Habouzit, Sep 28, 2008
  4. parse-opt: migrate builtin-merge-file.Pierre Habouzit, Sep 28, 2008
  5. Shawn O. PearceSep 29, 2008
  6. Pierre HabouzitSep 30, 2008
  7. Shawn O. PearceSep 30, 2008
  8. Pierre HabouzitSep 30, 2008
  9. Shawn O. PearceSep 30, 2008
  10. 1/3 parse-opt: migrate fmt-merge-msg.Pierre Habouzit, Oct 1, 2008
  11. 2/3 parse-opt: migrate git-merge-base.Pierre Habouzit, Oct 1, 2008
  12. 3/3 parse-opt: migrate builtin-merge-file.Pierre Habouzit, Oct 1, 2008
  13. Shawn O. PearceOct 1, 2008
  14. Shawn O. PearceOct 1, 2008
  15. Pierre HabouzitOct 2, 2008
  16. parse-opt: migrate fmt-merge-msg.Pierre Habouzit, Oct 2, 2008
  17. parse-opt: migrate git-merge-base.Pierre Habouzit, Oct 2, 2008
  18. parse-opt: migrate builtin-merge-file.Pierre Habouzit, Oct 2, 2008
  19. Sverre RabbelierSep 28, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.