Re: Subtree in Git

On Saturday, 27 October 2012 at 12:10 AM, Herman van Rink wrote:

On 10/22/2012 04:41 PM, dag@cray.com (mailto:dag@cray.com) wrote:

quoted

Herman van Rink <rink@initfour.nl (mailto:rink@initfour.nl)> writes:

quoted

On 10/21/2012 08:32 AM, Junio C Hamano wrote:

quoted

Herman van Rink <rink@initfour.nl (mailto:rink@initfour.nl)> writes:

quoted

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