From: Chris Packham <judge.packham@gmail.com>
To: Jens Lehmann <Jens.Lehmann@web.de>
Cc: Kevin Ballard <kevin@sb.org>,
Marc Branchaud <marcnarc@xiplink.com>,
Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v2 0/3] Teach fetch and pull to recursively fetch submodules too
Date: Wed, 13 Oct 2010 18:01:04 -0700 [thread overview]
Message-ID: <4CB65650.6080204@gmail.com> (raw)
In-Reply-To: <4CB61137.6030502@web.de>
On 13/10/10 13:06, Jens Lehmann wrote:
>
> For *your* use case it might not be correct, but for others it may very
> well be.
>
> We need to get more user stories like that to get an overview about what
> config options are useful and what might be reasonable defaults for them.
> And then we can decide what set of options and defaults to choose.
We'll if you want it here's an example of how we use submodules at $dayjob.
Most developers initially clone the project repo and run git submodule
update --init (or git submodule init && git submodule update if their
git version is too old). This could be replaced by git clone
--recursive, or just git clone if we there was a config for enabling
recursive cloning by default.
A few newbies have been confused by the fact that they run git clone but
don't actually end up with any code (in our case the superprojects are
just containers with no actual code themselves).
We have a continuous integration machine that does a git pull on all
submodules, a few automated tests and updates the superproject if the
tests pass. This would make use of git fetch/pull --recursive to grab
all the latest changes.
After the initial clone developers run git pull on the project. for
modules they aren't working on they run git submodule update <module>.
For modules they are working on they to rebase their working branch to
the SHA1 recorded in the superproject. I think this kind of thing has
already been discussed on the list, not sure that I've seen a solution
that would work for us. For now all of this is is wrapped in a script
for the developers.
Developers would probably want the fetch-if-super-gitlink-has-changed
behaviour. We also need to handle rebasing a submodule's checkedout
branch (if present) against the recorded submodule SHA1. This could
remain "our problem" as long as the worktree of these branches does not
get updated we can simply use the existing rebase logic we have today.
Hope that is a useful use-case.
--
- Chris
next prev parent reply other threads:[~2010-10-14 1:00 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-29 15:49 [RFC PATCH 0/2] Teach fetch and pull to recursively fetch submodules too Jens Lehmann
2010-08-29 15:50 ` [PATCH 1/2] fetch/pull: Recursively fetch populated submodules Jens Lehmann
2010-08-29 15:51 ` [PATCH 2/2] Submodules: Add the new "fetch" config option Jens Lehmann
2010-08-30 7:34 ` Junio C Hamano
2010-08-30 17:37 ` [PATCH 2/2 v2] Submodules: Add the new "fetch" config option for fetch and pull Jens Lehmann
2010-08-29 17:29 ` [RFC PATCH 0/2] Teach fetch and pull to recursively fetch submodules too Ævar Arnfjörð Bjarmason
2010-08-29 22:34 ` Jens Lehmann
2010-08-30 5:58 ` Junio C Hamano
2010-08-30 17:41 ` Jens Lehmann
2010-09-15 0:18 ` Kevin Ballard
2010-09-15 2:40 ` Kevin Ballard
2010-09-16 13:55 ` [PATCH] fetch: Get submodule paths from index and not from .gitmodules Jens Lehmann
2010-09-16 19:29 ` Kevin Ballard
2010-09-17 11:31 ` Jens Lehmann
2010-09-17 12:06 ` Johannes Sixt
2010-09-17 12:22 ` Jens Lehmann
2010-09-17 12:32 ` Johannes Sixt
2010-09-17 14:01 ` Jens Lehmann
2010-09-17 14:14 ` Johannes Sixt
2010-09-18 0:29 ` Kevin Ballard
2010-09-18 22:32 ` [PATCH 0/2] fix problems with recursive submodule fetching Jens Lehmann
2010-09-18 22:33 ` [PATCH 1/2] fetch: Fix a bug swallowing the output of " Jens Lehmann
2010-09-18 22:35 ` [PATCH 2/2] fetch: Get submodule paths from index and not from .gitmodules Jens Lehmann
2010-09-19 3:54 ` [PATCH 0/2] fix problems with recursive submodule fetching Kevin Ballard
2010-09-19 16:40 ` Jens Lehmann
2010-09-20 6:40 ` Kevin Ballard
2010-10-05 20:43 ` [PATCH v2 0/3] Teach fetch and pull to recursively fetch submodules too Jens Lehmann
2010-10-05 20:43 ` [PATCH 1/3] fetch/pull: Recursively fetch populated submodules Jens Lehmann
2010-10-05 20:44 ` [PATCH 2/3] Submodules: Add the new "fetch" config option for fetch and pull Jens Lehmann
2010-10-07 13:33 ` Jon Seymour
2010-10-09 19:22 ` Jens Lehmann
2010-10-09 19:54 ` Jonathan Nieder
2010-10-09 20:12 ` Jens Lehmann
2010-10-05 20:45 ` [PATCH 3/3] Add the 'fetch.recursive' config setting Jens Lehmann
2010-10-05 21:06 ` [PATCH v2 0/3] Teach fetch and pull to recursively fetch submodules too Junio C Hamano
2010-10-06 22:52 ` Kevin Ballard
2010-10-06 23:22 ` Jonathan Nieder
2010-10-09 19:28 ` Jens Lehmann
2010-10-09 20:02 ` Jonathan Nieder
2010-10-09 20:37 ` Jens Lehmann
2010-10-21 18:29 ` Jonathan Nieder
2010-10-21 21:15 ` Jens Lehmann
2010-10-09 19:17 ` Jens Lehmann
2010-10-13 14:48 ` Marc Branchaud
2010-10-13 19:32 ` Jens Lehmann
2010-10-13 19:34 ` Kevin Ballard
2010-10-13 20:06 ` Jens Lehmann
2010-10-13 20:11 ` Kevin Ballard
2010-10-14 1:01 ` Chris Packham [this message]
2010-10-14 18:14 ` Jens Lehmann
2010-10-14 18:31 ` Chris Packham
2010-10-13 21:27 ` Marc Branchaud
2010-10-13 21:31 ` Kevin Ballard
2010-09-15 11:32 ` [RFC PATCH 0/2] " Jens Lehmann
2010-09-15 23:12 ` Kevin Ballard
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=4CB65650.6080204@gmail.com \
--to=judge.packham@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kevin@sb.org \
--cc=marcnarc@xiplink.com \
/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 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 NNTP newsgroup(s).