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

Re: What's cooking in git.git (Feb 2020, #04; Mon, 17)

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Feb 21, 2020, 16:26 UTC
Message-ID
<e9984c53-7266-c438-87f5-7f5474e3adce@gmail.com>
In-Reply-To
<xmqq36b8lvdl.fsf@gitster-ct.c.googlers.com>
On 17/02/2020 22:08, Junio C Hamano wrote:
Show 27 quoted lines
> Here are the topics that have been cooking.  Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.  The ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.
> 
> Accumulated fixes on the 'master' front have been flushed to 'maint'
> and a new maintenance release 2.25.1 has been tagged.
> [...]
> [Stalled]
> 
> * pw/advise-rebase-skip (2019-12-06) 9 commits
>   - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
>   - rebase: fix advice when a fixup creates an empty commit
>   - commit: give correct advice for empty commit during a rebase
>   - commit: encapsulate determine_whence() for sequencer
>   - commit: use enum value for multiple cherry-picks
>   - sequencer: write CHERRY_PICK_HEAD for reword and edit
>   - cherry-pick: check commit error messages
>   - cherry-pick: add test for `--skip` advice in `git commit`
>   - t3404: use test_cmp_rev
> 
>   The mechanism to prevent "git commit" from making an empty commit
>   or amending during an interrupted cherry-pick was broken during the
>   rewrite of "git rebase" in C, which has been corrected.
> 
>   What's the status of this one?
>   The tip two are still RFC.

The tip "rebase -i: leave CHERRY_PICK_HEAD when there are conflicts" needs reworking and can be dropped (cf <7e1b92f5-48df-e202-ebcc-5b15987a7d63@gmail.com>). The other RFC patch "rebase: fix advice when a fixup creates an empty commit" [1] could do with someone commenting on it (I've Cc'd dscho and Elijah). I think the messages in it could be improved, but if the idea of different messages for fixups that make a commit empty is not popular then the rest of the series can be simplified by dropping some earlier patches including patch 6 which you had some doubts about. (I tired to address those <141f95b0-cae0-06f6-2c29-618dc22ae000@gmail.com> but I don't know if I convinced you)

Best Wishes
Phillip

[1] https://lore.kernel.org/git/20191206160614.631724-9-phillip.wood123@gmail.com/

Previous: Taylor BlauNext: Elijah Newren
Message 11 of 14 in “What's cooking in git.git (Feb 2020, #04; Mon, 17)”
  1. Junio C HamanoFeb 17, 2020
  2. Elijah NewrenFeb 18, 2020
  3. en/rebase-backend, was Re: What's cooking in git.git (Feb 2020, #04; Mon, 17)Johannes Schindelin, Feb 18, 2020
  4. Alban GruinFeb 26, 2020
  5. Elijah NewrenFeb 22, 2020
  6. Junio C HamanoFeb 22, 2020
  7. Taylor BlauFeb 19, 2020
  8. Eric SunshineFeb 19, 2020
  9. Junio C HamanoFeb 19, 2020
  10. Taylor BlauFeb 19, 2020
  11. Phillip WoodFeb 21, 2020
  12. Elijah NewrenFeb 22, 2020
  13. Junio C HamanoFeb 22, 2020
  14. Elijah NewrenFeb 26, 2020

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.