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
Miklos Vajna <vmiklos@frugalware.org>
Date
Jul 22, 2008, 07:39 UTC
Message-ID
<20080722073912.GN32057@genesis.frugalware.org>
In-Reply-To
<7vr69mpl5v.fsf@gitster.siamese.dyndns.org>
On Mon, Jul 21, 2008 at 10:01:16PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> Doesn't this make "git merge -s 'recursive resolve'" to misbehave?
Depends on what do we expect it to do. ;-)

My patch unified the handling of pull.twohead / -s option, so it (actually unintentionally) made -s accepting multiple strategies as a space separated list. Given that we already accept multiple strategies as a space separated list in pull.twohead (and we do _not_ use multiple pull.twohead entries) I think my patch is more logical.

Though, there was already a thread about how should we specify multiple strategies on the commandline; and you suggested in

        http://article.gmane.org/gmane.comp.version-control.git/89208
to use -s strategy1 -s strategy2.

In that case, I think your patch is better, and once it hits git.git, 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.

Does this sound reasonable?
Thanks.
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 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.