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

Re: [PATCH/RFC 1/2] Add 'git subtree' command for tracking history of subtrees separately.

From
Finn Arne Gangstad <finnag@pvv.org>
Date
Apr 30, 2009, 08:58 UTC
Message-ID
<20090430085853.GA21880@pvv.org>
In-Reply-To
<32541b130904291927m33908bacg2dbafcf64877b88f@mail.gmail.com>
On Wed, Apr 29, 2009 at 10:27:44PM -0400, Avery Pennarun wrote:
Show 14 quoted lines
> Many projects are made of a combination of several subprojects/libraries and
> some application-specific code.  In some cases, particularly when the
> subprojects are all maintained independently, 'git submodule' is the best
> way to deal with this situation.  But if you frequently change the
> subprojects as part of developing your application, use multiple branches,
> and sometimes want to push your subproject changes upstream, the overhead of
> manually managing submodules can be excessive.
> 
> 'git subtree' provides an alternative mechanism, based around the
> 'git merge -s subtree' merge strategy.  Instead of tracking a submodule
> separately, you merge its history into your main project, and occasionally
> extract a new "virtual history" from your mainline that can be easily merged
> back into the upstream project.  The virtual history can be incrementally
> expanded as you make more changes to the superproject.

We have the exact same situation. I wanted to attack this from the other end though, make submodules useable also in this scenario. The subtree solution seems to be much easier to do in git, so maybe this is a better approach!

Let's say you have three different projects that all use some shared modules, The following operations should all be easy and fully supported:

a) Modify project + some shared modules (in your project) with single commit b) Push project + shared modules (for your project) c) Push modifications to shared modules d) Merge upstream version of shared modules into your project.

My quick analysis: Your subtrees: a & b are easy, c & d are painful Current submodules: a & b are painful, c & d are tolerable (somewhat tedious with many shared modules, easy with one)

Subtrees also have the advantage that all the existing local tools will be a lot more useful without any modifications (gitk, git gui, git diff/patch/am/log/...)

To make subtrees realy useful, it would be good if you could improve c & d, syncing with the shared modules!

- Finn Arne
Previous: Ping YinNext: Avery Pennarun
Message 5 of 13 in “Add 'git subtree' command for tracking history of subtrees separately.”
  1. 1/2 Add 'git subtree' command for tracking history of subtrees separately.Avery Pennarun, Apr 26, 2009
  2. 2/2 Automated test script for 'git subtree'.Avery Pennarun, Apr 26, 2009
  3. Avery PennarunApr 30, 2009
  4. Ping YinApr 30, 2009
  5. Finn Arne GangstadApr 30, 2009
  6. Avery PennarunApr 30, 2009
  7. Andrey SmirnovJul 16, 2009
  8. Avery PennarunJul 16, 2009
  9. Andrey SmirnovJul 16, 2009
  10. Avery PennarunJul 16, 2009
  11. Andrey SmirnovJul 17, 2009
  12. Avery PennarunJul 17, 2009
  13. Andrey SmirnovJul 17, 2009

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.