diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-08-23 09:02:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-08-23 09:02:34 -0700 |
| commit | 5e56a39e6a9b8621e62f7a18ed027777a095dba7 (patch) | |
| tree | 6c444719f16ca94fb3a001f00378974372f4c906 /worktree.c | |
| parent | Merge branch 'ps/leakfixes-part-4' (diff) | |
| parent | config: hide functions using `the_repository` by default (diff) | |
| download | git-5e56a39e6a9b8621e62f7a18ed027777a095dba7.tar.gz git-5e56a39e6a9b8621e62f7a18ed027777a095dba7.zip | |
Merge branch 'ps/config-wo-the-repository'
Use of API functions that implicitly depend on the_repository
object in the config subsystem has been rewritten to pass a
repository object through the callchain.
* ps/config-wo-the-repository:
config: hide functions using `the_repository` by default
global: prepare for hiding away repo-less config functions
config: don't depend on `the_repository` with branch conditions
config: don't have setters depend on `the_repository`
config: pass repo to functions that rename or copy sections
config: pass repo to `git_die_config()`
config: pass repo to `git_config_get_expiry_in_days()`
config: pass repo to `git_config_get_expiry()`
config: pass repo to `git_config_get_max_percent_split_change()`
config: pass repo to `git_config_get_split_index()`
config: pass repo to `git_config_get_index_threads()`
config: expose `repo_config_clear()`
config: introduce missing setters that take repo as parameter
path: hide functions using `the_repository` by default
path: stop relying on `the_repository` in `worktree_git_path()`
path: stop relying on `the_repository` when reporting garbage
hooks: remove implicit dependency on `the_repository`
editor: do not rely on `the_repository` for interactive edits
path: expose `do_git_common_path()` as `repo_common_pathv()`
path: expose `do_git_path()` as `repo_git_pathv()`
Diffstat (limited to 'worktree.c')
| -rw-r--r-- | worktree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/worktree.c b/worktree.c index fd05f3741c..30a947426e 100644 --- a/worktree.c +++ b/worktree.c @@ -252,7 +252,7 @@ const char *worktree_lock_reason(struct worktree *wt) if (!wt->lock_reason_valid) { struct strbuf path = STRBUF_INIT; - strbuf_addstr(&path, worktree_git_path(wt, "locked")); + strbuf_addstr(&path, worktree_git_path(the_repository, wt, "locked")); if (file_exists(path.buf)) { struct strbuf lock_reason = STRBUF_INIT; if (strbuf_read_file(&lock_reason, path.buf, 0) < 0) |