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

Re: [PATCH] merge: refuse to create too cool a merge by default

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 18, 2016, 20:33 UTC
Message-ID
<xmqqoaabplue.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<CA+55aFz7309BkfHjD5H7tp9WE0yf1VWncxfmB3hgimJ00fbT-Q@mail.gmail.com>
Linus Torvalds <torvalds@linux-foundation.org> writes:
> Mine was slightly different, I just went with a "unrelated" merge option.

Yeah, I was debating myself if this should be -Xunrelated specific to recursive or an option that is meant for all strategies. I can go either way, but I think a command-wide option is logically the right way to go, because you do not want two-project merge by default no matter what strategy is used (and some of you may know that I had a long term plan with no lines of code yet to do yet another merge strategy).

> I'll attach my two patches anyway, if for no other reason than the
> fact that I actually wrote a new test for this.

Thanks, but after updating existing scripts, I think those changes already make sure that two-project merges work with the option. What is missing in my version is a new test that ensures the command fails a two-project merge by default.

Previous: Linus TorvaldsNext: Junio C Hamano
Message 3 of 10 in “merge: refuse to create too cool a merge by default”
  1. merge: refuse to create too cool a merge by defaultJunio C Hamano, Mar 18, 2016
  2. Linus TorvaldsMar 18, 2016
  3. Junio C HamanoMar 18, 2016
  4. Junio C HamanoApr 6, 2016
  5. Linus TorvaldsApr 6, 2016
  6. Junio C HamanoApr 6, 2016
  7. Eric SunshineMar 18, 2016
  8. Ramsay JonesMar 18, 2016
  9. David TurnerMar 18, 2016
  10. Junio C HamanoMar 18, 2016

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.