config: don't depend on `the_repository` with branch conditions

When computing branch "includeIf" conditions we use `the_repository` to
obtain the main ref store. We really shouldn't depend on this global
repository though, but should instead use the repository that is being
passed to us via `struct config_include_data`. Otherwise, when parsing
configuration of e.g. submodules, we may end up evaluating the condition
the via the wrong refdb.

Fix this.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/config.c b/config.c
index 831c9eacb06aecc76d2b3b19d7571a32b4e22c4b..08437f75e50f08def9905f1af90c365e8f114d49 100644 (file)
--- a/config.c
+++ b/config.c
@@ -300,13 +300,14 @@ done:
        return ret;
 }
 
-static int include_by_branch(const char *cond, size_t cond_len)
+static int include_by_branch(struct config_include_data *data,
+                            const char *cond, size_t cond_len)
 {
        int flags;
        int ret;
        struct strbuf pattern = STRBUF_INIT;
-       const char *refname = !the_repository->gitdir ?
-               NULL : refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
+       const char *refname = (!data->repo || !data->repo->gitdir) ?
+               NULL : refs_resolve_ref_unsafe(get_main_ref_store(data->repo),
                                               "HEAD", 0, NULL, &flags);
        const char *shortname;
 
@@ -406,7 +407,7 @@ static int include_condition_is_true(const struct key_value_info *kvi,
        else if (skip_prefix_mem(cond, cond_len, "gitdir/i:", &cond, &cond_len))
                return include_by_gitdir(kvi, opts, cond, cond_len, 1);
        else if (skip_prefix_mem(cond, cond_len, "onbranch:", &cond, &cond_len))
-               return include_by_branch(cond, cond_len);
+               return include_by_branch(inc, cond, cond_len);
        else if (skip_prefix_mem(cond, cond_len, "hasconfig:remote.*.url:", &cond,
                                   &cond_len))
                return include_by_remote_url(inc, cond, cond_len);