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

Re: [PATCH] mergetool: Teach about submodules

From
Jonathon Mah <me@jonathonmah.com>
Date
Apr 10, 2011, 10:15 UTC
Message-ID
<39B95643-D7FB-436F-B407-D716D43C3922@JonathonMah.com>
In-Reply-To
<20110409120301.GA1369@gmail.com>
Hi David,
On 2011-04-09, at 05:03, David Aguilar wrote:
> One thing that could make it better, though, would be if it
> also added tests for the feature to t/t7610-mergetool.sh.
> That will help prevent someone (like me) from accidentally
> breaking it in the future.
Thanks for the feedback. I've shoehorned some tests into the existing ones, and the patch is imminent. It can be squashed into the previous patch if that's nicer.
It would obviously be nice if you could tell mergetool to merge those submodule commits, and then have it recurse into the submodule. Submodules don't feel quite robust enough to me to automate to that extent yet, but I might keep tinkering should the urge emerge. :)

Jonathon Mah me@JonathonMah.com

Previous: David AguilarNext: Jonathon Mah
Message 3 of 7 in “mergetool: Teach about submodules”
  1. mergetool: Teach about submodulesJonathon Mah, Apr 9, 2011
  2. David AguilarApr 9, 2011
  3. Jonathon MahApr 10, 2011
  4. mergetool: Added tests for submoduleJonathon Mah, Apr 10, 2011
  5. Junio C HamanoApr 11, 2011
  6. Jonathon MahApr 13, 2011
  7. mergetool: Teach about submodulesJonathon Mah, Apr 13, 2011

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.