From: Bryan Larsen <bryan.larsen@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "Marc Branchaud" <marcnarc@xiplink.com>,
"Avery Pennarun" <apenwarr@gmail.com>,
skillzero@gmail.com, "Jakub Narebski" <jnareb@gmail.com>,
"Jens Lehmann" <Jens.Lehmann@web.de>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
git <git@vger.kernel.org>, "Junio C Hamano" <gitster@pobox.com>
Subject: Re: Avery Pennarun's git-subtree?
Date: Mon, 26 Jul 2010 13:36:25 -0400 [thread overview]
Message-ID: <4C4DC799.6070702@gmail.com> (raw)
In-Reply-To: <AANLkTimQywtn-0Fcr-ceLeHGeSBNROt+T=K+TowF_u5h@mail.gmail.com>
On 10-07-26 12:41 PM, Linus Torvalds wrote:
> On Mon, Jul 26, 2010 at 9:37 AM, Marc Branchaud<marcnarc@xiplink.com> wrote:
>>
>> I think I should mention one aspect of what we're doing, which is that a lot
>> of our submodules are based on external code, and that we occasionally need
>> to modify or customize some of that code. So it's quite nice for us to
>> maintain private git mirrors of the external repos, with our own private
>> branches that contain our modifications. Although we want to get much of our
>> changes incorporated into the upstream code bases, upstream release cycles
>> are rarely in sync with ours.
>
> THIS.
>
> This is why I always thought that submodules absolutely have to be
> commits, not trees. It's why the git submodule data structures are
> done the way they are. Anything that makes the submodule just a tree
> is fundamentally broken, I think.
>
> That said, I'm not competent to comment on the actual user interface
> issues. I can well believe that git-subtree has a nicer interface.
>
> Linus
>
To me, that's what git-subtree is: an internal private mirror of an
external repo. Using git submodule moves that into a separately
managed repo, which is just unnecessary hassle. Why maintain repo
called "clone of library X for project A" when you can just stick it
inside of project A without any downsides?
For us, changes are made in the superproject and tested in the
superproject. Once they're tested, a git subtree push or a git subtree
split pushes the patches to the subproject. Once the subproject has
accepted the patches, a git subtree pull merges them. Same workflow as
the "private git mirror of external repo" listed above, just without the
hassle of having another repo to manage.
Bryan
next prev parent reply other threads:[~2010-07-26 17:36 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-21 17:15 Avery Pennarun's git-subtree? Bryan Larsen
2010-07-21 19:43 ` Ævar Arnfjörð Bjarmason
2010-07-21 19:56 ` Avery Pennarun
2010-07-21 20:36 ` Ævar Arnfjörð Bjarmason
2010-07-21 21:09 ` Avery Pennarun
2010-07-21 21:20 ` Avery Pennarun
2010-07-21 22:46 ` Jens Lehmann
2010-07-22 1:09 ` Avery Pennarun
[not found] ` <m31vavn8la.fsf@localhost.localdomain>
2010-07-22 18:23 ` Bryan Larsen
2010-07-24 22:36 ` Jakub Narebski
2010-07-22 19:41 ` Avery Pennarun
2010-07-22 19:56 ` Jonathan Nieder
2010-07-22 20:06 ` Avery Pennarun
2010-07-22 20:17 ` Ævar Arnfjörð Bjarmason
2010-07-22 21:33 ` Avery Pennarun
2010-07-23 15:10 ` Jens Lehmann
2010-07-26 17:34 ` Eugene Sajine
2010-07-22 20:43 ` Elijah Newren
2010-07-22 21:32 ` Avery Pennarun
2010-07-23 8:31 ` Chris Webb
2010-07-23 8:40 ` Avery Pennarun
2010-07-23 15:11 ` Jens Lehmann
2010-07-23 22:33 ` Avery Pennarun
2010-07-23 15:13 ` Jens Lehmann
2010-07-23 15:10 ` Jens Lehmann
2010-07-23 16:05 ` Bryan Larsen
2010-07-23 17:11 ` Jens Lehmann
2010-07-23 19:01 ` Bryan Larsen
2010-07-23 22:32 ` Avery Pennarun
2010-07-25 19:57 ` Jens Lehmann
2010-07-27 18:40 ` Avery Pennarun
2010-07-27 21:14 ` Jens Lehmann
2010-07-23 15:19 ` Marc Branchaud
2010-07-23 22:50 ` Avery Pennarun
2010-07-24 0:58 ` skillzero
2010-07-24 1:20 ` Avery Pennarun
2010-07-24 19:40 ` skillzero
2010-07-25 1:47 ` Nguyen Thai Ngoc Duy
2010-07-28 22:27 ` Jakub Narebski
2010-07-26 13:13 ` Jakub Narebski
2010-07-26 16:37 ` Marc Branchaud
2010-07-26 16:41 ` Linus Torvalds
2010-07-26 17:36 ` Bryan Larsen [this message]
2010-07-26 17:48 ` Linus Torvalds
2010-07-27 18:28 ` Avery Pennarun
2010-07-27 20:25 ` Junio C Hamano
2010-07-27 20:57 ` Avery Pennarun
2010-07-27 21:14 ` Junio C Hamano
2010-07-27 21:32 ` Jens Lehmann
2010-07-26 8:56 ` Jakub Narebski
2010-07-27 18:36 ` Avery Pennarun
2010-07-28 13:36 ` Marc Branchaud
2010-07-28 18:32 ` Jakub Narebski
2010-07-24 20:07 ` Sverre Rabbelier
2010-07-26 8:51 ` Jakub Narebski
2010-07-27 19:15 ` Avery Pennarun
2010-07-26 15:15 ` Marc Branchaud
2010-07-21 23:46 ` Ævar Arnfjörð Bjarmason
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C4DC799.6070702@gmail.com \
--to=bryan.larsen@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=apenwarr@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=marcnarc@xiplink.com \
--cc=skillzero@gmail.com \
--cc=torvalds@linux-foundation.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.