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
Jun 16, 2018, 08:22 UTC
Message-ID
<CAF7_NFR8dKZtbRr+p_HGECdZhyqSWAsMuZ2JthXefGyFL+57zA@mail.gmail.com>
In-Reply-To
<xmqqh8m3zurz.fsf@gitster-ct.c.googlers.com>
> I do not know offhand if "reset --merge" should force succeeding in

such a case, but I agree that it is criminal to stop "reset --hard" with "not uptodate", as the whole point of "hard reset" is to get rid of the 'not up-to-date' modification.

I originally had a fix just for "reset --hard". It was in verify_uptodate_1(), to move check for "->reset" earlier. But then I found that "merge --abort" does not use "reset --hard", but rather --merge, so I fixed that. Because --merge should work also, shouldn't it?

Actually, I think that fix in verify_uptodate_1() was right, I just did not find what it affects, after the other fix

Previous: Junio C HamanoNext: Max Kirillov
Message 3 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.