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>
Chen Linxuan committed
Jul 10, 2026 at 14:43 UTC
52bd2ff2741e376ab8b92c354ba64bdf9d1c2c0a
1 file changed
+8
-11
config.c
+8
-11
@@ -235,23 +235,20 @@ static int prepare_include_condition_pattern(const struct key_value_info *kvi,
235
return 0;
236
}
237
238
-static int include_by_gitdir(const struct key_value_info *kvi,
239
- const struct config_options *opts,
240
- const char *cond, size_t cond_len, int icase)
238
+static int include_by_path(const struct key_value_info *kvi,
239
+ const char *path,
240
+ const char *cond, size_t cond_len, int icase)
241
{
242
struct strbuf text = STRBUF_INIT;
243
struct strbuf pattern = STRBUF_INIT;
244
size_t prefix;
245
int ret = 0;
246
- const char *git_dir;
246
int already_tried_absolute = 0;
247
249
- if (opts->git_dir)
250
- git_dir = opts->git_dir;
251
- else
248
+ if (!path)
249
goto done;
250
254
- strbuf_realpath(&text, git_dir, 1);
251
+ strbuf_realpath(&text, path, 1);
252
strbuf_add(&pattern, cond, cond_len);
253
ret = prepare_include_condition_pattern(kvi, &pattern, &prefix);
254
if (ret < 0)
@@ -284,7 +281,7 @@ again:
281
* which'll do the right thing
282
*/
283
strbuf_reset(&text);
287
- strbuf_add_absolute_path(&text, git_dir);
284
+ strbuf_add_absolute_path(&text, path);
285
already_tried_absolute = 1;
286
goto again;
287
}
@@ -400,9 +397,9 @@ static int include_condition_is_true(const struct key_value_info *kvi,
397
const struct config_options *opts = inc->opts;
398
399
if (skip_prefix_mem(cond, cond_len, "gitdir:", &cond, &cond_len))
403
- return include_by_gitdir(kvi, opts, cond, cond_len, 0);
400
+ return include_by_path(kvi, opts->git_dir, cond, cond_len, 0);
401
else if (skip_prefix_mem(cond, cond_len, "gitdir/i:", &cond, &cond_len))
405
- return include_by_gitdir(kvi, opts, cond, cond_len, 1);
402
+ return include_by_path(kvi, opts->git_dir, cond, cond_len, 1);
403
else if (skip_prefix_mem(cond, cond_len, "onbranch:", &cond, &cond_len))
404
return include_by_branch(inc, cond, cond_len);
405
else if (skip_prefix_mem(cond, cond_len, "hasconfig:remote.*.url:", &cond,