On Thu, Aug 16, 2018 at 10:37 AM Junio C Hamano <gits...@pobox.com> wrote:
>
> Stefan Beller <sbel...@google.com> writes:
>
> > The change a086f921a72 (submodule: decouple url and submodule interest,
> > 2017-03-17) enables us to do more than originally thought.
> > As the url setting was used both to actually set the url where to
> > obtain the submodule from, as well as used as a boolean flag later
> > to see if it was active, we would need to keep the url around.
> >
> > Now that submodules can be activated using the submodule.[<name>.]active
> > setting, we could remove the url if the submodule is activated via that
> > setting.
>
> ... as the cloned submodule repository has $GIT_DIR/config which
> knows its own origin, we do not need to record URL in superproject's
> $GIT_DIR/config. Back before we started using a directory under
> $GIT_DIR/modules/ as a more permanent location to store submodule,
> and point at it by a gitdir file in $path/.git to allow removal of a
> submodule from the working tree of the superproject without having
> to reclone when resurrecting the same submodule, it may have been
> useful to keep custom URL somewhere in the superproject, but that no
> longer is the case.
>
> > In preparation to do so, pave the way by providing an easy way to see
> > if a submodule is considered active via the new .active setting or via
> > the old .url setting.
>
> Makes sense.
>
> >
> > Signed-off-by: Stefan Beller <sbel...@google.com>
> > ---
> > submodule.c | 5 +----
> > submodule.h | 6 ++++++
> > 2 files changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/submodule.c b/submodule.c
> > index 6e14547e9e0..d56350ed094 100644
> > --- a/submodule.c
> > +++ b/submodule.c
> > @@ -221,9 +221,6 @@ int
> > option_parse_recurse_submodules_worktree_updater(const struct option *opt,
> > return 0;
> > }
> >
> > -/*
> > - * Determine if a submodule has been initialized at a given 'path'
> > - */
> > int is_submodule_active(struct repository *repo, const char *path)
> > {
> > int ret = 0;
> > @@ -267,7 +264,7 @@ int is_submodule_active(struct repository *repo, const
> > char *path)
> >
> > /* fallback to checking if the URL is set */
> > key = xstrfmt("submodule.%s.url", module->name);
> > - ret = !repo_config_get_string(repo, key, &value);
> > + ret = !repo_config_get_string(repo, key, &value) ? 2 : 0;
> >
> > free(value);
> > free(key);
> > diff --git a/submodule.h b/submodule.h
> > index 4644683e6cb..bfc070e4629 100644
> > --- a/submodule.h
> > +++ b/submodule.h
> > @@ -45,6 +45,12 @@ extern int git_default_submodule_config(const char *var,
> > const char *value, void
> > struct option;
> > int option_parse_recurse_submodules_worktree_updater(const struct option
> > *opt,
> > const char *arg, int
> > unset);
> > +/*
> > + * Determine if a submodule has been initialized at a given 'path'.
> > + * Returns 1 if it is considered active via the submodule.[<name>.]active
> > + * setting, or return 2 if it is active via the older submodule.url
> > setting.
> > + */
> > +#define SUBMODULE_ACTIVE_VIA_URL 2
> > extern int is_submodule_active(struct repository *repo, const char *path);
> > /*
> > * Determine if a submodule has been populated at a given 'path' by
> > checking if
>
> This change assumes that all the existing return sites in the
> is_submodule_active() function signals true with 1 (or at least some
> value that is different from 2).
Yes.
> So I think this patch is insufficient, and needs to at least change
> the "submodule.active" codepath to return !!ret; otherwise, a caller
> that now expects 0 (not active), 1 (active but can lose URL) and 2
> (active and the presence of URL makes it so) will be confused when
> one of the MATCHED_* constants from dir.h comes back.
Yes.
I'll resend when appropriately.
Thanks,
Stefan
