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

Re: [PATCH] submodule merge support

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
May 6, 2007, 22:18 UTC
Message-ID
<alpine.LFD.0.98.0705061517380.12945@woody.linux-foundation.org>
In-Reply-To
<20070506220745.GA2439@steel.home>
On Mon, 7 May 2007, Alex Riesen wrote:
Show 10 quoted lines
> Martin Waitz, Sun, May 06, 2007 21:02:24 +0200:
> > When merge-recursive gets to a dirlink, it starts an automatic
> > submodule merge and then uses the resulting merge commit for the
> > top-level tree.
> 
> merge-recursive is a mess already, you just made even more so.
> Besides, you completely forgot all other merge strategies.
> 
> How about making all existing strategies just ignore submodules, and
> move recursive merge in the merge driver (git-merge.sh)?
Yes, I think that's the right thing to do.

I think it's the right thing for another reason: in a true "recursive" merge, the submodules shouldn't be recursively merged anyway. *THEIR* merge will have its own history, and doing it based on some random history of the superproject is actually wrong anyway!

		Linus
Previous: Martin WaitzNext: Martin Waitz
Message 4 of 10 in “submodule merge support”
  1. submodule merge supportMartin Waitz, May 6, 2007
  2. Alex RiesenMay 6, 2007
  3. Martin WaitzMay 6, 2007
  4. Linus TorvaldsMay 6, 2007
  5. Martin WaitzMay 7, 2007
  6. Johannes SixtMay 7, 2007
  7. Linus TorvaldsMay 7, 2007
  8. Martin WaitzMay 7, 2007
  9. Martin WaitzMay 7, 2007
  10. Martin WaitzMay 7, 2007

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.