From: Yoichi NAKAYAMA via GitGitGadget Date: Sat, 17 Oct 2026 12:55:00 GMT Subject: [PATCH v3 3/5] worktree repair: use read_gitfile_raw() in infer_backlink() Message-ID: <7087e829bbfafe22b665364d8ee56526fd12e783.1792241702.git.gitgitgadget@gmail.com> In-Reply-To: From: Yoichi NAKAYAMA Use read_gitfile_raw() in infer_backlink() to parse .git files consistently with repair_gitfile(). Unlike strbuf_trim(), read_gitfile_raw() does not silently discard trailing whitespace. Such whitespace is treated as part of the path and may cause the path to be treated as not referencing a repository. Extract get_worktree_id() for use in a subsequent commit. Signed-off-by: Yoichi NAKAYAMA --- worktree.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/worktree.c b/worktree.c index f8e9850f6f..3627dbc044 100644 --- a/worktree.c +++ b/worktree.c @@ -637,6 +637,14 @@ int other_head_refs(struct repository *repo, return ret; } +static const char *get_worktree_id(const char *dotgit_contents) +{ + const char *slash = find_last_dir_sep(dotgit_contents); + if (!slash) + return ""; + return slash + 1; +} + /* * Repair worktree's /path/to/worktree/.git file if missing, corrupt, or not * pointing at /worktrees/. @@ -801,27 +809,24 @@ static ssize_t infer_backlink(struct repository *repo, const char *gitfile, struct strbuf *inferred) { - struct strbuf actual = STRBUF_INIT; + struct strbuf contents = STRBUF_INIT; const char *id; + int err; - if (strbuf_read_file(&actual, gitfile, 0) < 0) + err = read_gitfile_raw(&contents, gitfile); + if (err) goto error; - if (!starts_with(actual.buf, "gitdir:")) - goto error; - if (!(id = find_last_dir_sep(actual.buf))) - goto error; - strbuf_trim(&actual); - id++; /* advance past '/' to point at */ + id = get_worktree_id(contents.buf); if (!*id) goto error; repo_common_path_replace(repo, inferred, "worktrees/%s", id); if (!is_directory(inferred->buf)) goto error; - strbuf_release(&actual); + strbuf_release(&contents); return inferred->len; error: - strbuf_release(&actual); + strbuf_release(&contents); strbuf_reset(inferred); /* clear invalid path */ return -1; } -- gitgitgadget