Re: [PATCH 3/3] fsck: mention file path for index errors
- From
Jeff King <peff@peff.net>
- Date
- May 11, 2023, 16:17 UTC
- Message-ID
- <20230511161757.GA1973344@coredump.intra.peff.net>
- In-Reply-To
- <305ccc55-25e3-6b01-cd86-9a9035839d06@sunshineco.com>
On Thu, May 11, 2023 at 02:39:59AM -0400, Eric Sunshine wrote:
Show 30 quoted lines
> > Signed-off-by: Jeff King <peff@peff.net>
> > ---
> > diff --git a/builtin/fsck.c b/builtin/fsck.c
> > @@ -795,7 +797,8 @@ static int fsck_resolve_undo(struct index_state *istate)
> > -static void fsck_index(struct index_state *istate)
> > +static void fsck_index(struct index_state *istate, const char *index_path,
> > + int is_main_index)
>
> This adds an `is_main_index` flag, but...
>
> > @@ -993,12 +998,19 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
> > + if (read_index_from(&istate, path,
> > get_worktree_git_dir(wt)) > 0)
> > - fsck_index(&istate);
> > + fsck_index(&istate, path, wt->is_current);
>
> ...this accesses `is_current`, the value of which is "true" only for the
> worktree in which the Git command was run, which is not necessarily the main
> worktree. The main worktree, on the other hand, is guaranteed to be the
> first entry returned by get_worktrees(), so shouldn't this instead be:
>
> worktrees = get_worktrees();
> for (p = worktrees; *p; p++) {
> ...
> fsck_index(&istate, path, p == worktrees);
> ...
> }
> free_worktrees(worktrees);
>
> Or am I fundamentally misunderstanding something?I think "current" is what we want here, since the point was to return the short-but-syntactically-correct ":path-in-index" for the current worktree, which is where "rev-parse :path-in-index", etc, would look when resolving that name.
So the code is working as intended, but I may have misused the term "main" with respect to other worktree code. I didn't even know that was a concept, not having dealt much with worktrees.
Maybe it's worth s/main/current/ here (and I guess in t1450)?
-Peff