git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Do not record unstaged deleted file upon recursive merge if file was moved outside of working tree with enabled sparse-checkout.

From
Mikhail Filippov <mikhail@filippov.me>
Date
Sep 12, 2016, 11:07 UTC
Message-ID
<1843881473678425@web17m.yandex.ru>
In-Reply-To
<xmqqeg4q6mw4.fsf@gitster.mtv.corp.google.com>
Show 9 quoted lines
>>  +test_expect_success 'move file/sparse-checkout/merge should not delete moved file' '
>>  + git rm -rf . &&
>>  + git clean -fdqx &&
>>  + rm -rf .git &&
>>  + git init &&
>
> Yuck. This is inherited from existing tests but I think they need
> to be cleaned up. It is not your fault, and it is not in the scope
> of this change.
It's part need for cleanup repository from the previous case.
Previous: Mikhail Filippov
Message 4 of 4 in “Do not record unstaged deleted file upon recursive merge if file was moved outside of working tree with enabled sparse-checkout.”
  1. Do not record unstaged deleted file upon recursive merge if file was moved outside of working tree with enabled sparse-checkout.Mikhail Filippov, Sep 11, 2016
  2. Junio C HamanoSep 11, 2016
  3. Mikhail FilippovSep 12, 2016
  4. Mikhail FilippovSep 12, 2016

Read the whole thread, see it on lore, or plain text.

$ 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.