Re: [PATCH 08/13] add: prevent adding sparse conflict files

From: Matheus Tavares Bernardino <matheus.bernardino@usp.br>
Date: Aug 27, 2021, 21:16 UTC
Message-ID: <CAHd-oW5ZgG0Rr4THdeyWQtkdNpJGmp-WuCW7RjJA1AiN1nmSKg@mail.gmail.com>
In-Reply-To: <f1764f9ed187a2f383bd8269e198192fe0486bda.1629842085.git.gitgitgadget@gmail.com>

On Tue, Aug 24, 2021 at 6:54 PM Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com> wrote:

Show 11 quoted lines

>
> From: Derrick Stolee <dstolee@microsoft.com>
>
> 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.