Re: [RFC GSoC 2009: git-submodule for multiple, active developers on active trees]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Great, thanks Shawn. I've included my responses to your
questions/comments below, and would love to continue the dialog - any
help with the application would be much appreciated. I'll work my
responses into my application and send it out again.

On 3/30/09, Shawn O. Pearce <spearce@xxxxxxxxxxx> wrote:
> Hi!  As someone who has coded around git submodule by creating "repo"
>  for Android, I'm certainly interested in git submodule improvements,
>  so this is a great idea for a GSoC project.  I have some comments
>  below that may help improve your proposal before you submit it.
>

I was going to send out another request for comments to the list, but
you beat me to it. The first part of my proposal is to get community
involvement, is this mailing list the best place to do that, or
something external, like a publicly editable site (e.g. a survey or
wiki)?

>
> > As opposed to ???remotes,??? which also incorporate external code into a
>  > project,
>
>
> I'm not sure what you mean by that.  Typically a "remote" in Git is
>  thought to be a configuration that says where to download a fork of
>  this project from.  By default you get one remote, called "origin",
>  which is where you initially cloned your fork from, but you can add
>  many more, such as other developers you frequently collaborate with.
>
>  This is quite different from the problem that submodule tries
>  to address, as its dealing with forks of of the *same* project.
>  But a submodule is trying to point to forks of *other* projects,
>  whose histories are (possibly) unrelated to this project's history.
>

Right. My point is that due to either perceived or real problems with
git-submodules, some folks have abandoned it and instead used
workarounds (see
http://flavoriffic.blogspot.com/2008/05/managing-git-submodules-with-gitrake.html?showComment=1210125780000#c1605130977296198852
for one example of such a comment). That so much effort has been put
into solutions external to git, shows that there is some pent up
demand for a solution built into git.

>
>  > The tentative timeline is:
>  >
>  > End of May ??? Conclusively finish the public discussion regarding where
>  > git-submodules needs to go
>  > Beginning of June ??? Produce final specifications (including method stubs)
>  > Middle of July ??? Finish active code and test development
>  > End of July ??? Merge code into production release, fix public submitted bugs
>  > Middle of August ??? Prepare code for final release and finish
>  > user-facing documentation
>
>
> IMHO, this is too vague.  *What exactly* are the features you want
>  to add to git submodule?  Break this down by features, not by phases
>  of coding.
>

The features I have been considering are:
*move objects of submodules into base .git/ directory
**This would, as I understand it: protect submodules from being
overwritten and changes lost when switching between branches of the
superproject that might or might not contain the submodules and
centralize their management into one location.  The added benefits of
fully using git's ability to branch and merge submodules makes it
worth adding some complexity within the .git directory.

*use .git instead of .gitmodules
**I actually don't know why this was included with the project
description, I searched for an explanation of the desired name change
on the mailing list and in commit messages, but came up with nothing.

*git submodule update --init should initialize nested levels of submodules
**As an ease of use command, either an additional flag to recurse can
be added, or it can act by default. As a requested feature on the
mailing list, this is worth implementing.

*ability to update submodule pulled from svn repo
**One workaround is to clone it as local copy using git-svn and then
import that local clone as a submodule; clearly a clunky solution.
There are many requests for this feature (see
http://panthersoftware.com/articles/view/4/git-svn-dcommit-workaround-for-git-submodules
for a typical example), and it makes sense integrating git-submodule
with git-svn would expand submodule's usefulness.

*make submodules deal with updated references
**Instead of issuing merge conflicts on updated submodule references,
this will allow submodules on default detached HEAD so that changes
from the local repo can be committed without first pulling changes
from the shared repo. See
http://flavoriffic.blogspot.com/2008/05/managing-git-submodules-with-gitrake.html?showComment=1211380200000#c3897235118548537475
for an explanation of how this made 'submodules...unsuitable for
active development'. Clearly losing this kind of functionality impairs
the overall usability of git and should be fixed.

*protect changes in local submodules when doing “git submodule update”
**This is similar to the previous point, in that changes need to be
protected or merged or warnings issued when updating the submodule.
The potential to lose work with no warning is a big no-no.

*make git submodules easy to remove
** See http://pitupepito.homelinux.org/?p=24, for an example of why
this is a pain. Adding a submodule has ui, removing one should as
well.

>  Further, you spend roughly a month writing method stubs.

Week max: end of May to beginning of June, but if I

>
>  Also, we very much prefer Git patches to update the documentation
>  at the same time that the code changes.

Fair enough. I was planning on starting documentation during the
stubbing phase, and then finishing it once having written the code.

>
>
>  > A few specific changes that this project will likely include are:
>  >
>  > *use .git instead of .gitmodules
>  > *move objects of submodules into .git/ directory
>  > *git submodule update --init should initialize nested levels of submodules
>
> > *protect changes in local submodules when doing ???git submodule update???
>
>  As I said above, I'd like to see this described in the timeline
>  better, each of these could be done independently, so you could work
>  on one item try to get it completed, tested, documented, and merged
>  into Junio's tree, and then start the next item.

Ok, makes sense. I can redo the timeline like that, I'll order them by
my priority and look for community input on re-ranking them and adding
or subtracting features.


>
>  I'd like to know more about each of these items, and less about
>  the general reasoning of where you got these feature ideas from.
>  What exactly are you talking about changing, and why? I don't need
>  to see detailed code at this stage, but I'd like a better description
>  of the user-visible changes that each bullet point might cause,
>  and why you feel this change is better than what we have today.
>

See above.

Phill Baker
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux