[PATCH v2 4/5] worktree repair: reduce .git file reads
flat view
COOLING4d
SUPERSEDED
From: Yoichi NAKAYAMA via GitGitGadget <hidden>
Date: 2026-10-14 21:20:44
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v2 of 2 in this series.
Revisions (2)
- v2 current
- v3 [diff vs current]
From: Yoichi NAKAYAMA <redacted> Pass the loaded contents of the .git file to infer_backlink(). Signed-off-by: Yoichi NAKAYAMA <redacted> --- worktree.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/worktree.c b/worktree.c
index 3627dbc044..879941a977 100644
--- a/worktree.c
+++ b/worktree.c@@ -806,27 +806,20 @@ static int is_main_worktree_path(struct repository *repo, const char *path) * Returns -1 on failure and strbuf.len on success. */ static ssize_t infer_backlink(struct repository *repo, - const char *gitfile, + const char *dotgit_contents, struct strbuf *inferred) { - struct strbuf contents = STRBUF_INIT; const char *id; - int err; - err = read_gitfile_raw(&contents, gitfile); - if (err) - goto error; - id = get_worktree_id(contents.buf); + id = get_worktree_id(dotgit_contents); if (!*id) goto error; repo_common_path_replace(repo, inferred, "worktrees/%s", id); if (!is_directory(inferred->buf)) goto error; - strbuf_release(&contents); return inferred->len; error: - strbuf_release(&contents); strbuf_reset(inferred); /* clear invalid path */ return -1; }
@@ -877,7 +870,7 @@ void repair_worktree_at_path(struct repository *repo, } dotgit_contents = contents.buf; - infer_backlink(repo, dotgit.buf, &inferred_backlink); + infer_backlink(repo, dotgit_contents, &inferred_backlink); strbuf_realpath_forgiving(&inferred_backlink, inferred_backlink.buf, 0); if (is_absolute_path(dotgit_contents)) {
--
gitgitgadget