Re: [PATCH v2 1/7] fetch/pull: recurse into submodules when necessary
On 11-03-01 06:01 PM, Jens Lehmann wrote:
Show 63 quoted lines
> To be able to access all commits of populated submodules referenced by the
> superproject it is sufficient to only then let "git fetch" recurse into a
> submodule when the new commits fetched in the superproject record new
> commits for it. Having these commits present is extremely useful when
> using the "--submodule" option to "git diff" (which is what "git gui" and
> "gitk" do since 1.6.6), as all submodule commits needed for creating a
> descriptive output can be accessed. Also merging submodule commits (added
> in 1.7.3) depends on the submodule commits in question being present to
> work. Last but not least this enables disconnected operation when using
> submodules, as all commits necessary for a successful "git submodule
> update -N" will have been fetched automatically. So we choose this mode as
> the default for fetch and pull.
>
> Before a new or changed ref from upstream is updated in update_local_ref()
> "git rev-list <new-sha1> --not --branches --remotes" is used to determine
> all newly fetched commits. These are then walked and diffed against their
> parent(s) to see if a submodule has been changed. If that is the case, its
> path is stored to be fetched after the superproject fetch is completed.
>
> Using the "--recurse-submodules" or the "--no-recurse-submodules" option
> disables the examination of the fetched refs because the result will be
> ignored anyway.
>
> There is currently no infrastructure for storing deleted and new
> submodules in the .git directory of the superproject. Thats why fetch and
> pull for now only fetch submodules that are already checked out and are
> not renamed.
>
> In t7403 the "--no-recurse-submodules" argument had to be added to "git
> pull" to avoid failure because of the moved upstream submodule repo.
>
> Thanks-to: Jonathan Nieder <jrnieder@gmail.com>
> Thanks-to: Heiko Voigt <hvoigt@hvoigt.net>
> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
> ---
> Documentation/fetch-options.txt | 11 ++++
> builtin/fetch.c | 25 ++++++---
> submodule.c | 106 +++++++++++++++++++++++++++++++++++---
> submodule.h | 9 +++
> t/t5526-fetch-submodules.sh | 109 +++++++++++++++++++++++++++++++++++++++
> t/t7403-submodule-sync.sh | 2 +-
> 6 files changed, 245 insertions(+), 17 deletions(-)
>
> diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
> index f37276e..ae22f75 100644
> --- a/Documentation/fetch-options.txt
> +++ b/Documentation/fetch-options.txt
> @@ -73,6 +73,17 @@ ifndef::git-pull[]
> Prepend <path> to paths printed in informative messages
> such as "Fetching submodule foo". This option is used
> internally when recursing over submodules.
> +
> +--submodule-default=[yes|on-demand]::
> + This option is used internally to set the submodule recursion default
> + to either a boolean configuration value representing "true" (for
> + unconditonal recursion) or to "on-demand" (when only those submodules
> + should be fetched of which new commits have been fetched in its
> + superproject).
> + This option will be overridden by the 'fetch.recurseSubmodules' and
> + 'submodule.<name>.fetchRecurseSubmodules' settings in
> + linkgit:gitmodules[5] and linkgit:git-config[1] while all of them
> + are ignored when the "--[no-]recurse-submodules" option is given.
> endif::git-pull[]
Rolling out the bike...
I think the option name and it's explanation need to be a little clearer:
--recurse-submodules-default=[yes|on-demand]::
This option is used internally to temporarily provide a
non-negative default value for the --recurse-submodules
option. All other methods of configuring fetch's submodule
recursion (such as settings in linkgit:gitmodules[5] and
linkgit:git-config[1]) override this option, as does
specifying --[no-]recurse-submodules directly.
M.
Marc Branchaud <marcnarc@xiplink.com>