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

Re: [PATCH v2 1/2] commit/reset: try to clean up sequencer state

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 17, 2019, 07:04 UTC
Message-ID
<xmqqr2a1jenm.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<20190416101842.16556-2-phillip.wood123@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> writes:
> Avoid this
> potential problem by removing the sequencer state if we're committing or
> resetting the final pick in a sequence.

The use-case story before this conclusion only mentioned "commit" that concluded the multi-step cherry-pick/revert, and never talked about "reset", which made my eyebrows to rise.

As a part of "reset", we have already been removing CHERRY_PICK_HEAD and REVERT_HEAD, so "git reset" during a conflicted "cherry-pick" for example is already destructive and the user can no longer get back to continuing the cherry-pick anyway after running it, even without this patch. So from that point of view, it does make sense to remove the other sequencer states at the same time.

Thanks.
Previous: Phillip WoodNext: Johannes Schindelin
Message 13 of 15 in “A couple of cherry-pick related fixes”
  1. 0/2 A couple of cherry-pick related fixesPhillip Wood, Mar 29, 2019
  2. 1/2 commit/reset: try to clean up sequencer statePhillip Wood, Mar 29, 2019
  3. Junio C HamanoApr 1, 2019
  4. Phillip WoodApr 8, 2019
  5. Duy NguyenApr 1, 2019
  6. Phillip WoodApr 8, 2019
  7. 2/2 fix cherry-pick/revert status after commitPhillip Wood, Mar 29, 2019
  8. Junio C HamanoApr 1, 2019
  9. Phillip WoodApr 8, 2019
  10. 0/2 A couple of cherry-pick related fixesPhillip Wood, Apr 16, 2019
  11. 2/2 fix cherry-pick/revert status after commitPhillip Wood, Apr 16, 2019
  12. 1/2 commit/reset: try to clean up sequencer statePhillip Wood, Apr 16, 2019
  13. Junio C HamanoApr 17, 2019
  14. Johannes SchindelinApr 17, 2019
  15. Phillip WoodApr 17, 2019

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.