Re: Subtree with submodule inside?

2014-08-07 Thread Heiko Voigt
On Wed, Aug 06, 2014 at 04:51:52PM -0700, Jonathan Nieder wrote: > Junio C Hamano wrote: > > Jonathan Nieder writes: > > >> 2. Submodules aware of their superproject and of the parent's branches. > >> In other words, submodules would act as though under refs/ they > >> had a symlink > >>

Re: Subtree with submodule inside?

2014-08-06 Thread Jonathan Nieder
Junio C Hamano wrote: > Jonathan Nieder writes: >> 2. Submodules aware of their superproject and of the parent's branches. >> In other words, submodules would act as though under refs/ they >> had a symlink >> >> parent -> ../../../refs >> >> So you could do >> >> git check

Re: Subtree with submodule inside?

2014-08-06 Thread Junio C Hamano
Jonathan Nieder writes: > 2. Submodules aware of their superproject and of the parent's branches. > In other words, submodules would act as thought under refs/ they > had a symlink > > parent -> ../../../refs > > So you could do > > git checkout --recurse-submodules maste

Re: Subtree with submodule inside?

2014-08-06 Thread Jonathan Nieder
Jens Lehmann wrote: > There were thoughts about having "git branch" optionally create a > branch in the submodule too. But in a lot of real world scenarios > that won't help because the same branch name won't necessarily make > sense in superproject and submodule at the same time So, here is how

Re: Subtree with submodule inside?

2014-08-06 Thread Jens Lehmann
Am 06.08.2014 um 20:18 schrieb Robert Dailey: > On Wed, Aug 6, 2014 at 12:51 PM, Junio C Hamano wrote: >> My knee-jerk reaction would be "subtree would break submodules >> badly, don't use it" ;-). >> >> After all, I invented subtree merge as an ugly interim workaround >> before submodule subsyste

Re: Subtree with submodule inside?

2014-08-06 Thread Robert Dailey
On Wed, Aug 6, 2014 at 12:51 PM, Junio C Hamano wrote: > My knee-jerk reaction would be "subtree would break submodules > badly, don't use it" ;-). > > After all, I invented subtree merge as an ugly interim workaround > before submodule subsystem got into a usable shape, hoping that new > projects

Re: Subtree with submodule inside?

2014-08-06 Thread Junio C Hamano
Robert Dailey writes: > Is this even possible? The .gitmodule file has to be at the root of > the repository, AFAIK. So if the subtree is inherently not at the > root, how does it manage its own submodules? > > Basically I have a common library that also keeps a submodule of third > party depende

Subtree with submodule inside?

2014-08-06 Thread Robert Dailey
Is this even possible? The .gitmodule file has to be at the root of the repository, AFAIK. So if the subtree is inherently not at the root, how does it manage its own submodules? Basically I have a common library that also keeps a submodule of third party dependencies (binaries). Each super projec