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

Re: Subtree in Git

From
HRHerman van Rink <rink@initfour.nl>
Date
Oct 21, 2012, 20:23 UTC
Message-ID
<508459B3.6030403@initfour.nl>
In-Reply-To
<7vfw57fvtl.fsf@alter.siamese.dyndns.org>
On 10/21/2012 09:51 PM, Junio C Hamano wrote:
Show 41 quoted lines
> Herman van Rink <rink@initfour.nl> writes:
>
>> On 10/21/2012 08:32 AM, Junio C Hamano wrote:
>>> Herman van Rink <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.
> Yes, dag volunteered to be the area maintainer to act as a
> gatekeeper for me.
>
> The message you addressed to me was sent as a response to his
> message, where he gave you specific suggestions to improve the patch
> and turn it into a readable series instead of a single ball of wax
> and it looked to me as if you are trying to bypass him and shove the
> single ball of wax to our history over his objection.
>
> I haven't formed an opinion on the particular change as to how bad
> its collapsing unrelated changes into a single change is. Maybe they
> are not as unrelated and form a coherent whole.  Maybe not.  Also I
> personally do not mind too much if the area maintainer for contrib/
> has a lower standard for atomicity of commits compared to the rest
> of the system.  But I do prefer the decision to be made at the level
> of area maintainer's, and have issues when people try to bypass
> without a good reason.
>
> Note that I was not following the thread very closely, so I may have
> misread the discussion.  I read his "Unless Junio accepts..." to
> mean "I (dag) still object, but if Junio accepts that patch I object
> to directly, there is nothing I can do about it".  That is very
> different from "I am on the fence and cannot decide it is a good
> patch or not.  I'll let Junio decide; I am OK as long as he is".
>
> Thanks.

Thanks for explaining. I had read it the latter way.

The problem is that I don't have the time to split all these out. Dag has indicated that he does not have the time either.

This single ball of wax was already an alternative to the 'messy' merge history it had accumulated. The result of merging from dozens of github forks with numerous levels of parallel/contra-productive whitspace fixes.

Dag: Did I read it correctly?
-- 
Met vriendelijke groet / Regards,

Herman van Rink
Initfour websolutions
Previous: Junio C HamanoNext: dag@cray.com
Message 20 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.