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

Re: [PATCH] builtin-merge: give a proper error message for invalid strategies in config

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 22, 2008, 08:24 UTC
Message-ID
<7v7ibenx75.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20080722073912.GN32057@genesis.frugalware.org>
Miklos Vajna <vmiklos@frugalware.org> writes:
> ... I
> would like to send a patch that changes the config parsing as well, so
> that pull.twohead "foo bar" would be invalid, and the user would have to
> have two pull.twohead entries: one for foo and one for bar.

Don't. pull.* has always been defined as "list of strategies", and -s has always been defined to take "a" strategy.

IOW, you don't need to break anything further.
Previous: Miklos VajnaNext: Miklos Vajna
Message 5 of 6 in “builtin-merge: give a proper error message for invalid strategies in config”
  1. builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna, Jul 21, 2008
  2. Junio C HamanoJul 22, 2008
  3. Junio C HamanoJul 22, 2008
  4. Miklos VajnaJul 22, 2008
  5. Junio C HamanoJul 22, 2008
  6. t7601: extend the 'merge picks up the best result' testMiklos Vajna, Jul 22, 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.