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

Re: [PATCH 2/2] fix cherry-pick/revert status after commit

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 1, 2019, 08:34 UTC
Message-ID
<xmqqv9zyxgwk.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<20190329163009.493-3-phillip.wood123@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> writes:
Show 5 quoted lines
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> If the user commits a conflict resolution using 'git commit' during a
> sequence of picks then 'git status' missed the fact that a
> cherry-pick/revert is still in progress.

How well would this play with the previous step? Didn't the change to builtin/commit.c made in [1/2] mean that after 'git commit' that concludes the last step, there is nothing 'git status' to notice?

Previous: Phillip WoodNext: Phillip Wood
Message 8 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.