On Tue, Aug 24, 2021 at 6:54 PM Derrick Stolee via GitGitGadget <gitgitgadget@xxxxxxxxx> wrote: > > From: Derrick Stolee <dstolee@xxxxxxxxxxxxx> > > When a merge results in a conflict outside of the sparse-checkout cone, > the conflicted file is written to the working tree and the index entry > loses the SKIP_WORKTREE bit. This allows users to add the file to the > index without realizing that the file might leave the working tree in a > later Git command. > > Block this behavior, but keep in mind that the user can override the > failure using the '--sparse' option. Hmm, didn't we already block this behavior at patch 6? Nevertheless, as I mentioned there, I think the change to find_pathspecs_matching_skip_worktree() from this patch should be together with the other changes from 6.
