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

From: Sergey Organov <sorganov@gmail.com>
Date: Feb 6, 2024, 19:45 UTC
Message-ID: <87il31s7g1.fsf@osv.gnss.ru>
In-Reply-To: <ZcIYz82iLxPOVR9Q@ugly>

Oswald Buddenhagen <oswald.buddenhagen@gmx.de> writes:

Show 18 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
> 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.

Yep. Maybe, if the rebase action itself were called "amend" rather than "edit", it'd have been more clear and consistent thus less confusing. Check:

git status
interactive rebase in progress; onto e79552d197
Last command done (1 command done):
   amend 71b73de914 message for first commit
Next commands to do (6 remaining commands):
   amend 3a478a7a08 message for second commit
   pick fab7159cf4 message for third commit
  (use "git rebase --edit-todo" to view and edit)
You are currently amending a commit while rebasing branch
'my_completion_updates' on 'e79552d197'.
  (use "git commit --amend" to amend the current commit)
  (use "git rebase --continue" once you are satisfied with your changes)

-- 
Sergey