From: Yoichi NAKAYAMA Date: Sat, 17 Oct 2026 02:40:03 GMT Subject: Re: [PATCH v2 5/5] worktree repair: avoid breaking unrelated .git file and gitdir Message-ID: In-Reply-To: On Fri, Oct 16, 2026 at 3:03 AM Junio C Hamano wrote: > > "Yoichi NAKAYAMA via GitGitGadget" writes: > > > diff --git a/worktree.c b/worktree.c > > index 879941a977..86094307b1 100644 > > --- a/worktree.c > > +++ b/worktree.c > > @@ -640,7 +640,11 @@ int other_head_refs(struct repository *repo, > > static const char *get_worktree_id(const char *dotgit_contents) > > { > > const char *slash = find_last_dir_sep(dotgit_contents); > > - if (!slash) > > + const char *prefix = "/worktrees"; > > + int prefixlen = strlen(prefix); > > + if (!slash || > > + slash - dotgit_contents < prefixlen || > > + strncmp(slash - prefixlen, prefix, prefixlen)) > > return ""; > > return slash + 1; > > Just being curious, but slash is found by scanning dotgit_contents > for either '/' or '\'. We make sure what comes before the slash > is "/worktree". > > Could there be situations where this code needs to accept > > "...\worktrees\my-worktree" > > where slash points at the backslash before "my-worktree"? Because > somebody wrote the pathname with backslash before the worktree name, > it would be natural to expect another backslash before the "worktrees" > constant, no? For that matter, would this code need to also accept > > ".../worktrees//my-worktree" > > where three are extra/duplicated slashes (or backslashes)? The > normal code paths to create these directories and records the path > to these directories should hopefully be using the canonical '/' > without unnecessary duplicate slashes, but (1) existing use of > find_last_dir_sep() might be a sign that we may have to deal with > backslashes, and (2) since this is about reparing a broken set-up, > it does not seem too far-fetched to attempt dealing with the above > two sample input, hence this question. While Git doesn't create a .git file with backslash separators, it can find the repository from such .git file on Windows. So I think 'worktree repair' should handle it. I will also add handling for duplicated separators. Thanks, -- Yoichi NAKAYAMA