From: Marc Branchaud <marcnarc@xiplink.com>
To: Jens Lehmann <Jens.Lehmann@web.de>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH v3 3/7] config: teach the fetch.recurseSubmodules option the 'on-demand' value
Date: Wed, 02 Mar 2011 11:02:11 -0500 [thread overview]
Message-ID: <4D6E6A03.2090902@xiplink.com> (raw)
In-Reply-To: <4D6D7B00.1020807@web.de>
On 11-03-01 06:02 PM, Jens Lehmann wrote:
> To enable the user to change the default behavior of "git fetch" and "git
> pull" regarding submodule recursion add the new "on-demand" value which
> has just been added to the "--recurse-submodules" command line option.
>
> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
> ---
> Documentation/config.txt | 10 +++++++---
> submodule.c | 2 +-
> t/t5526-fetch-submodules.sh | 28 ++++++++++++++++++++++++++++
> 3 files changed, 36 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 96ce272..7b06fe5 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -900,9 +900,13 @@ diff.wordRegex::
> characters are *ignorable* whitespace.
>
> fetch.recurseSubmodules::
> - A boolean value which changes the behavior for fetch and pull, the
> - default is to not recursively fetch populated submodules unless
> - configured otherwise.
> + This option can be either set to a boolean value or to 'on-demand'.
> + Setting it to a boolean changes the behavior of fetch and pull to
> + unconditionally recurse into submodules when set to true or to not
> + recurse at all when set to false. When set to 'on-demand' (the default
> + value), it tells fetch and pull to recurse only into those submodules
> + where new commits are recorded in the commmits fetched for the
> + superproject.
Nit: Replace the last sentence with
When set to 'on-demand' (the default value), fetch and pull will
only recurse into a populated submodule when its superproject
retrieves a commit that updates the submodule's reference.
M.
next prev parent reply other threads:[~2011-03-02 16:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 22:59 [PATCH v2 0/7] Teach fetch/pull the on-demand mode and make it the default Jens Lehmann
2011-03-01 23:01 ` [PATCH v2 1/7] fetch/pull: recurse into submodules when necessary Jens Lehmann
2011-03-02 15:42 ` Marc Branchaud
2011-03-01 23:01 ` [PATCH v2 2/7] fetch/pull: Add the 'on-demand' value to the --recurse-submodules option Jens Lehmann
2011-03-02 16:00 ` Marc Branchaud
2011-03-02 16:02 ` Marc Branchaud
2011-03-01 23:02 ` [PATCH v3 3/7] config: teach the fetch.recurseSubmodules option the 'on-demand' value Jens Lehmann
2011-03-02 16:02 ` Marc Branchaud [this message]
2011-03-01 23:03 ` [PATCH v2 4/7] Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option Jens Lehmann
2011-03-01 23:03 ` [PATCH v2 5/7] fetch/pull: Don't recurse into a submodule when commits are already present Jens Lehmann
2011-03-02 16:08 ` Marc Branchaud
2011-03-01 23:04 ` [PATCH v2 6/7] submodule update: Don't fetch when the submodule commit is " Jens Lehmann
2011-03-01 23:04 ` [PATCH v2 7/7] fetch/pull: Describe --recurse-submodule restrictions in the BUGS section Jens Lehmann
2011-03-02 20:53 ` Jens Lehmann
2011-03-02 16:09 ` [PATCH v2 0/7] Teach fetch/pull the on-demand mode and make it the default Marc Branchaud
2011-03-02 23:35 ` Jens Lehmann
-- strict thread matches above, loose matches on Subject: below --
2011-03-06 22:09 [PATCH v3 " Jens Lehmann
2011-03-06 22:11 ` [PATCH v3 3/7] config: teach the fetch.recurseSubmodules option the 'on-demand' value Jens Lehmann
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=4D6E6A03.2090902@xiplink.com \
--to=marcnarc@xiplink.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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.
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).