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

Re: is it a bug that git status show the in-progress 'edit' in an interactive rebase as 'done'?

From
Britton Kerin <britton.kerin@gmail.com>
Date
Feb 6, 2024, 20:09 UTC
Message-ID
<CAC4O8c_1JnDc5v+_xS9Q=0fJmoK3e8iYiag2gT8KchcJdvgcTg@mail.gmail.com>
In-Reply-To
<ZcIYz82iLxPOVR9Q@ugly>

On Tue, Feb 6, 2024 at 2:32 AM Oswald Buddenhagen <oswald.buddenhagen@gmx.de> wrote:

Show 15 quoted lines
>
> On Tue, Feb 06, 2024 at 01:02:43AM -0900, Britton Kerin wrote:
> >>Last command done (1 command done):
> >>   edit 71b73de914 message for first commit
> >>...
> >>You are currently editing a commit while rebasing branch
> >>...
> >
> >This seems wrong, because until git rebase --continue has been done
> >the edit operation for the first commit is *ongoing* and it would be
> >much clearer for the output of status to accurately say so.
> >
> it makes a lot of more sense when you decompose 'edit' into 'pick'
> followed by 'break', which it essentially is. so from git's perspective,
> the command really _is_ already done. note that in this state, you can
well viewed this way the pick may be done but not the implicit break
> do all kinds of crazy things - including adding new commits (possibly by
> cherry-picking them) and even dropping already rewritten commits (using
> a hard reset). so in a way, the message above is even a bit too
> suggestive.

Yes. I'd handle this by changing the description of edit offered in the comments in the todo to better reflect the possibilities. The hints that git rebase -i (or --continue I guess) gives when it hits the edit commit also don't reflect all the possibilities very well.

Britton
Previous: Sergey Organov
Message 4 of 4 in “is it a bug that git status show the in-progress 'edit' in an interactive rebase as 'done'?”
  1. Britton KerinFeb 6, 2024
  2. Oswald BuddenhagenFeb 6, 2024
  3. Sergey OrganovFeb 6, 2024
  4. Britton KerinFeb 6, 2024

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.