From: "W. Trevor King" <wking@tremily.us>
To: Jens Lehmann <Jens.Lehmann@web.de>
Cc: Git <git@vger.kernel.org>
Subject: Re: Git submodule for a local branch?
Date: Tue, 23 Oct 2012 18:09:55 -0400 [thread overview]
Message-ID: <20121023220955.GA30442@odin.tremily.us> (raw)
In-Reply-To: <508704D5.9020902@web.de>
[-- Attachment #1: Type: text/plain, Size: 2266 bytes --]
On Tue, Oct 23, 2012 at 10:57:57PM +0200, Jens Lehmann wrote:
> Am 22.10.2012 14:37, schrieb W. Trevor King:
> > but cloning a remote repository (vs. checking out a local branch)
> > seems to be baked into the submodule implementation. Should I be
> > thinking about generalizing git-submodule.sh, or am I looking under
> > the wrong rock? My ideal syntax would be something like
> >
> > $ git submodule add -b c --local dir-for-c/
>
> But then we'd have to be able to have two (or more) work trees using
> the same git directory, which current submodule code can't.
And that's the problem I'm trying to solve ;).
> > The motivation is that I have website that contains a bunch of
> > sub-sites, and the sub-sites share content. I have per-sub-site
> > branches (a, b, c) and want a master branch (index) that aggregates
> > them. Perhaps this is too much to wedge into a single repository?
>
> To me this sounds upside-down. I'd put the three sub-sites into
> different repositories and the shared content into a submodule that
> all three sub-sites use. At least that is how I do all my content
> sharing on the websites I have done ... does that make sense?
That makes sense, however the problem is not in the common content, it
is in the final index:
index
|-- sub-site a (branch of sub-site-x)
|-- sub-site b (branch of sub-site-x)
`-- sub-site c (branch of sub-site-x)
All of the sub-sites are branches of a single sub-site-x master:
o--o--o--o sub-site-x
\--o--o--o sub-site-1
\--o sub-site-2
\--o sub-site-3
So they all live in the same repository. My index repository will
have submodules for each of the sub-sites, and I'd like the index
branch to *also* live in same repository as the subsites. This last
bit is the sticky part.
For a proof-of-concept example (where I currently use public
repositories for the sub-site submodules), see
http://wking.github.com/swc-workshop/
which uses gh-pages as the index branch, and master, 2012-10-caltech,
and 2012-10-lbl for the sub-site branches.
--
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-10-23 23:10 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-22 12:37 Git submodule for a local branch? W. Trevor King
2012-10-23 13:21 ` W. Trevor King
2012-10-23 20:57 ` Jens Lehmann
2012-10-23 22:09 ` W. Trevor King [this message]
2013-01-08 15:59 ` Moving (renaming) submodules, recipe/script W. Trevor King
-- strict thread matches above, loose matches on Subject: below --
2013-01-07 0:36 W. Trevor King
2013-01-07 1:39 ` Jonathan Nieder
2013-01-07 6:59 ` Jens Lehmann
2013-01-07 7:44 ` Junio C Hamano
2013-01-07 8:18 ` Jens Lehmann
2013-01-07 16:08 ` Junio C Hamano
2013-01-07 12:08 ` W. Trevor King
2013-01-08 14:32 ` W. Trevor King
2013-01-08 17:12 ` Jens Lehmann
2013-01-08 17:48 ` W. Trevor King
2013-02-09 12:32 ` [BUG] can't switch branches with submodules W. Trevor King
2013-02-03 23:38 ` Moving (renaming) submodules, recipe/script W. Trevor King
2013-02-03 22:36 [New Feature] git-submodule-move - Easily move submodules TJ
2013-02-04 20:14 ` Jens Lehmann
2013-02-09 12:25 [BUG] can't switch branches with submodules Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121023220955.GA30442@odin.tremily.us \
--to=wking@tremily.us \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).