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

Exposing the states of sequencer, etc.

From
Phil Hord <phil.hord@gmail.com>
Date
Apr 19, 2019, 17:57 UTC
Message-ID
<CABURp0p6RmwjW4BN4qPv5iBKC_kzZFGyKJxuWw=+pEpjZGtV_A@mail.gmail.com>
"Junio C Hamano via vger.kernel.org" writes:
Show 11 quoted lines
> > When cherry-picking or reverting a sequence of commits and if the final
> > pick/revert has conflicts and the user uses `git commit` to commit the
> > conflict resolution and does not run `git cherry-pick --continue` then
> > the sequencer state is left behind. This can cause problems later.
> > ...
> I've certainly seen this myself.  Do you use command line prompt
> support to remind you of the operation in progress?  I do, and I
> have a suspicion that it did not help me in this situation by
> ceasing to tell me that I have leftover state files after a manual
> commit of the final step that conflicted and gave control back to
> me.

Is there some place today that we explain the many rules Git uses to determine the operations in progress? I once had a patch to do this in code, but I think I let it die in committee. It was something like:

     $ git status --show-progress-state
     cherry-pick, conflicts, untracked

It would be helpful first to have an API for this, of course, though I think that's where I got mired before.

I'm willing to take it on again, if there's not already some alternative.
Next: Jeff King
Message 1 of 3 in “Exposing the states of sequencer, etc.”
  1. Phil HordApr 19, 2019
  2. Jeff KingApr 19, 2019
  3. Phil HordApr 20, 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.