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

Re: [PATCH] unpack-trees: do not fail reset because of unmerged skipped entry

From
Max Kirillov <max@max630.net>
Date
Jul 10, 2018, 19:23 UTC
Message-ID
<20180710192309.GB2050@jessie.local>
In-Reply-To
<xmqqh8m3zurz.fsf@gitster-ct.c.googlers.com>
On Fri, Jun 15, 2018 at 12:58:40PM -0700, Junio C Hamano wrote:
Show 11 quoted lines
> Do we want to verify the state after the 'hard' reset succeeds as
> well?  Things like 
> 
>  - all paths in the HEAD and all paths in the index are identical;
> 
>  - paths that do exist in the working tree are all identical to HEAD
>    version; and
> 
>  - paths that do not exist in the working tree are missing due to
>    the sparse checkout setting (iow, it is a bug if a path that is
>    outside the "sparse" setting is missing from the working tree).

I implemented the additional check, it is a bit different literally, but should be equivalent for this case

Previous: Max KirillovNext: Duy Nguyen
Message 4 of 9 in “unpack-trees: do not fail reset because of unmerged skipped entry”
  1. unpack-trees: do not fail reset because of unmerged skipped entryMax Kirillov, Jun 15, 2018
  2. Junio C HamanoJun 15, 2018
  3. Max KirillovJun 16, 2018
  4. Max KirillovJul 10, 2018
  5. Duy NguyenJun 16, 2018
  6. Max KirillovJul 10, 2018
  7. Duy NguyenJul 11, 2018
  8. Junio C HamanoJul 11, 2018
  9. unpack-trees: do not fail reset because of unmerged skipped entryMax Kirillov, Jul 10, 2018

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.