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

Re: Subtree in Git

From
David Michael Barr <b@rr-dav.id.au>
Date
Oct 26, 2012, 13:58 UTC
Message-ID
<2DDAA35052EA4F88A6EAC4FBDDF7FCCD@rr-dav.id.au>
In-Reply-To
<508A8BD3.9020901@initfour.nl>
On Saturday, 27 October 2012 at 12:10 AM, Herman van Rink wrote:
Show 42 quoted lines
> On 10/22/2012 04:41 PM, dag@cray.com (mailto:dag@cray.com) wrote:
> > Herman van Rink <rink@initfour.nl (mailto:rink@initfour.nl)> writes:
> > 
> > > On 10/21/2012 08:32 AM, Junio C Hamano wrote:
> > > > Herman van Rink <rink@initfour.nl (mailto:rink@initfour.nl)> writes:
> > > > 
> > > > > Junio, Could you please consider merging the single commit from my
> > > > > subtree-updates branch? https://github.com/helmo/git/tree/subtree-updates
> > > > 
> > > > 
> > > > In general, in areas like contrib/ where there is a volunteer area
> > > > maintainer, unless the change something ultra-urgent (e.g. serious
> > > > security fix) and the area maintainer is unavailable, I'm really
> > > > reluctant to bypass and take a single patch that adds many things
> > > > that are independent from each other.
> > > 
> > > 
> > > Who do you see as volunteer area maintainer for contrib/subtree?
> > > My best guess would be Dave. And he already indicated earlier in the
> > > thread to be ok with the combined patch as long as you are ok with it.
> > 
> > 
> > Let's be clear. Junio owns the project so what he says goes, no
> > question. I provided some review feedback which I thought would help
> > the patches get in more easily. We really shouldn't be adding multiple
> > features in one patch. This is easily separated into multiple patches.
> > 
> > Then there is the issue of testcases. We should NOT have git-subtree go
> > back to the pre-merge _ad_hoc_ test environment. We should use what the
> > usptream project uses. That will make mainlining this much easier in
> > the future.
> > 
> > If Junio is ok with overriding my decisions here, that's fine. But I
> > really don't understand why you are so hesitant to rework the patches
> > when it should be realtively easy. Certainly easier than convincing me
> > they are in good shape currently. :)
> 
> 
> 
> If it's so easy to rework these patches then please do so yourself.
> It's been ages since I've worked on this so I would also have to
> re-discover everything.
>From a quick survey, it appears there are no more than 55 patches

squashed into the submitted patch. As I have an interest in git-subtree for maintaining the out-of-tree version of vcs-svn/ and a desire to improve my rebase-fu, I am tempted to make some sense of the organic growth that happened on GitHub. It doesn't appear that anyone else is willing to do this, so I doubt there will be any duplication of effort.

-- David Michael Barr

Previous: Herman van RinkNext: James Nylen
Message 25 of 35 in “Subtree in Git”
  1. Hilco WijbengaApr 27, 2012
  2. dag@cray.comApr 27, 2012
  3. Hilco WijbengaApr 27, 2012
  4. Herman van RinkMay 1, 2012
  5. greened@obbligato.orgMay 4, 2012
  6. Herman van RinkMay 4, 2012
  7. Junio C HamanoMay 5, 2012
  8. dag@cray.comMay 7, 2012
  9. Herman van RinkMay 7, 2012
  10. dag@cray.comMay 7, 2012
  11. Junio C HamanoMay 11, 2012
  12. dag@cray.comMay 23, 2012
  13. greened@obbligato.orgJun 12, 2012
  14. Herman van RinkJun 13, 2012
  15. dag@cray.comJul 11, 2012
  16. Herman van RinkOct 20, 2012
  17. Junio C HamanoOct 21, 2012
  18. Herman van RinkOct 21, 2012
  19. Junio C HamanoOct 21, 2012
  20. Herman van RinkOct 21, 2012
  21. dag@cray.comOct 22, 2012
  22. dag@cray.comOct 22, 2012
  23. dag@cray.comOct 22, 2012
  24. Herman van RinkOct 26, 2012
  25. David Michael BarrOct 26, 2012
  26. James NylenOct 26, 2012
  27. dag@cray.comOct 29, 2012
  28. KindjalMar 1, 2013
  29. Paul CampbellMar 1, 2013
  30. David Michael BarrMar 2, 2013
  31. Paul CampbellMar 2, 2013
  32. Paul CampbellMar 4, 2013
  33. dag@cray.comOct 29, 2012
  34. Daniel KoesterMay 4, 2012
  35. greened@obbligato.orgJun 12, 2012

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.