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

Re: [BUG] rebase -i with only empty commits

From
PWPhillip Wood <phillip.wood@talktalk.net>
Date
Aug 24, 2017, 13:35 UTC
Message-ID
<374688cd-1d62-ef4f-a989-346ad1953ae8@talktalk.net>
In-Reply-To
<alpine.DEB.2.21.1.1708231639470.19382@virtualbox>
On 23/08/17 15:40, Johannes Schindelin wrote:
Show 7 quoted lines
> 
> These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe
> you want to do that, too?
> 
> Ciao,
> Dscho
>

This is slightly off topic but when I was preparing the patches for [1] I noticed a couple of potential bugs with rebase --keep-empty that I haven't got around to doing anything about.

1 - If 'rebase --keep-empty' stops for a conflict resolution then it cannot resume. This is because it uses cherry-pick rather than format-patch/am and does not create $GIT_DIR/rebase-apply so there is no saved rebase state for continue to use. In any case the --continue code does not have the cherry-pick special case for --keep-empty that the startup code does. I think this could be fixed by using an implicit interactive rebase.

2 - The opt-spec allows '--no-keep-empty' but as far as I could see that option is never checked for in the rebase code.

Best Wishes
Phillip

[1] https://public-inbox.org/git/20170726102720.15274-1-phillip.wood@talktalk.net/

Previous: Philip Oakley
Message 9 of 9 in “[BUG] rebase -i with empty commits + exec”
  1. Stefan BellerAug 22, 2017
  2. [BUG] rebase -i with only empty commitsStephan Beyer, Aug 23, 2017
  3. Johannes SchindelinAug 23, 2017
  4. Stephan BeyerAug 23, 2017
  5. Stefan BellerAug 23, 2017
  6. Stephan BeyerAug 23, 2017
  7. Junio C HamanoAug 23, 2017
  8. Philip OakleyAug 23, 2017
  9. Phillip WoodAug 24, 2017

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.