Re: Help using git subtree

From: Gabriel Jover <gjover@cells.es>
Date: Jul 31, 2013, 06:57 UTC
Message-ID: <51F8B53F.7030602@cells.es>
In-Reply-To: <20130730095846.GA19369@paksenarrion.iveqy.com>

Al 30/07/13 11:58, En/na Fredrik Gustafsson ha escrit:

Show 7 quoted lines

>> Git subtree is very convenient to get all the sub-projects into the
>> main-project directory tree
>> and to send back sub-project commits to the corresponding repository.
>> But I don't understand the work flow very well.
> I haven't used subtree that much however how do you commit to upstream?
> AFAIK every commit to the subtree must be done in the subtree branch and
> then merged back to the "superproject"-branch with a subtree merge.

I use "git subtree pull" and "git subtree push". AFAIK with subtree all commits are in the same repository, thus one does not need to go to the subtree branch to commit. This is one of the advantages of subtree.

Show 8 quoted lines

>> I can add a subtree with a given prefix and pull/push my commits to
>> the repository,
>> but how do I do to pull/push commits from the main-project to the
>> corresponding repository
>> avoiding sub-projects to be sent?
> You don't. A subtree is a subtree in your git-repo and is therefore a
> part of your repository. When you're using subtree that project will be
> a part of you project.

I expected that there would be a way to split the main project and push it, in the same way that one can split one subtree and push it. If not, this could be a feature request.

Show 10 quoted lines

>> An other question I have is when will be subtree included in git packages.
>> I had to compile git from sources in order to get this feature.
>>
> If you're asking when git-subtree will move from contrib/ to core git, I
> don't know. That's a decision for Junio. I would argue that it shouldn't
> because submodules can do everything that subtrees are good at and
> git.git should focus on doing one solution well instead of doing the
> same thing in two bad ways. However since git.git already uses a
> subtree-like style for gitk, git-gui, etc.  it doesn't seem like Junio
> agrees with me on this point.

Right, I rephrase: When git-subtree will move from contrib/ to core git?

Let me also empathize that I find git-subtree much more convenient than sub-modules. One can work with a single repository as it were a single project, one can commit changes that affect different sub-projects with just one command, use common tags and branches and so on.

Show 6 quoted lines

>> Si heu rebut aquest correu per error, us informo que pot contenir informació confidencial i privada i que està prohibit el seu ús. Us agrairiem que ho comuniqueu al remitent i l'elimineu. Gràcies.
>> Si ha recibido este correo por error, le informo de que puede contener información confidencial  y privada y que está prohibido su uso. Le agradeceré que lo comunique a su remitente y lo elimine. Gracias.
>> If you have received  this e-mail by error, please note that it may contain confidential and private  information, therefore, the use of this information is strictly forbidden. Please inform the sender of the error and delete the information received. Thank you.
> Is this really something to have in e-mails to a public list? Some lists
> won't accept this type of e-mails, or simply just ignore you.
>

Don't worry about this signature, it only applies if one receives this e-mail by mistake.

Best regards,

Gabriel

-- 
Si heu rebut aquest correu per error, us informo que pot contenir informació confidencial i privada i que està prohibit el seu ús. Us agrairiem que ho comuniqueu al remitent i l'elimineu. Gràcies.
Si ha recibido este correo por error, le informo de que puede contener información confidencial  y privada y que está prohibido su uso. Le agradeceré que lo comunique a su remitente y lo elimine. Gracias.
If you have received  this e-mail by error, please note that it may contain confidential and private  information, therefore, the use of this information is strictly forbidden. Please inform the sender of the error and delete the information received. Thank you.