config: refactor include_by_gitdir() into include_by_path()

The include_by_gitdir() function matches the realpath of a given
path against a glob pattern, but its interface is tightly coupled to
the gitdir condition: it takes a struct config_options *opts and
extracts opts->git_dir internally.

Refactor it into a more generic include_by_path() helper that takes
a const char *path parameter directly, and update the gitdir and
gitdir/i callers to pass opts->git_dir explicitly.  No behavior
change, just preparing for the addition of a new worktree condition
that will reuse the same path-matching logic with a different path.

Signed-off-by: Chen Linxuan <me@black-desk.cn>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/config.c b/config.c
index 156f2a24fa00271c6d6adafac16527e674f5ccd4..7d5dae0e8450850184275d08dcce328856707d54 100644 (file)
--- a/config.c
+++ b/config.c
@@ -235,23 +235,20 @@ static int prepare_include_condition_pattern(const struct key_value_info *kvi,
        return 0;
 }
 
-static int include_by_gitdir(const struct key_value_info *kvi,
-                            const struct config_options *opts,
-                            const char *cond, size_t cond_len, int icase)
+static int include_by_path(const struct key_value_info *kvi,
+                          const char *path,
+                          const char *cond, size_t cond_len, int icase)
 {
        struct strbuf text = STRBUF_INIT;
        struct strbuf pattern = STRBUF_INIT;
        size_t prefix;
        int ret = 0;
-       const char *git_dir;
        int already_tried_absolute = 0;
 
-       if (opts->git_dir)
-               git_dir = opts->git_dir;
-       else
+       if (!path)
                goto done;
 
-       strbuf_realpath(&text, git_dir, 1);
+       strbuf_realpath(&text, path, 1);
        strbuf_add(&pattern, cond, cond_len);
        ret = prepare_include_condition_pattern(kvi, &pattern, &prefix);
        if (ret < 0)
@@ -284,7 +281,7 @@ again:
                 * which'll do the right thing
                 */
                strbuf_reset(&text);
-               strbuf_add_absolute_path(&text, git_dir);
+               strbuf_add_absolute_path(&text, path);
                already_tried_absolute = 1;
                goto again;
        }
@@ -400,9 +397,9 @@ static int include_condition_is_true(const struct key_value_info *kvi,
        const struct config_options *opts = inc->opts;
 
        if (skip_prefix_mem(cond, cond_len, "gitdir:", &cond, &cond_len))
-               return include_by_gitdir(kvi, opts, cond, cond_len, 0);
+               return include_by_path(kvi, opts->git_dir, cond, cond_len, 0);
        else if (skip_prefix_mem(cond, cond_len, "gitdir/i:", &cond, &cond_len))
-               return include_by_gitdir(kvi, opts, cond, cond_len, 1);
+               return include_by_path(kvi, opts->git_dir, cond, cond_len, 1);
        else if (skip_prefix_mem(cond, cond_len, "onbranch:", &cond, &cond_len))
                return include_by_branch(inc, cond, cond_len);
        else if (skip_prefix_mem(cond, cond_len, "hasconfig:remote.*.url:", &cond,