Re: [PATCH v2 06/10] t6428: new test for SKIP_WORKTREE handling and conflicts

From: Derrick Stolee <stolee@gmail.com>
Date: Mar 11, 2021, 14:55 UTC
Message-ID: <a478e63e-164e-9d38-0d23-5312fedf0953@gmail.com>
In-Reply-To: <d1d8c017b23ff227bbf4b8b500e8a5b1f2a0ebca.1615271086.git.gitgitgadget@gmail.com>

On 3/9/2021 1:24 AM, Elijah Newren via GitGitGadget wrote:

Show 8 quoted lines

> From: Elijah Newren <newren@gmail.com>
> 
> If there is a conflict during a merge for a SKIP_WORKTREE entry, we
> expect that file to be written to the working copy and have the
> SKIP_WORKTREE bit cleared in the index.  If the user had manually
> created a file in the working tree despite SKIP_WORKTREE being set, we
> do not want to clobber their changes to that file, but want to move it
> out of the way.  Add tests that check for these behaviors.

Thank you for this test!
 
-Stolee

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.