All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sergey Organov <sorganov@gmail.com>
To: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Cc: Britton Kerin <britton.kerin@gmail.com>,  git@vger.kernel.org
Subject: Re: is it a bug that git status show the in-progress 'edit' in an interactive rebase as 'done'?
Date: Tue, 06 Feb 2024 22:45:18 +0300	[thread overview]
Message-ID: <87il31s7g1.fsf@osv.gnss.ru> (raw)
In-Reply-To: <ZcIYz82iLxPOVR9Q@ugly> (Oswald Buddenhagen's message of "Tue, 6 Feb 2024 12:32:31 +0100")

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

> 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

  reply	other threads:[~2024-02-06 19:45 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-06 10:02 is it a bug that git status show the in-progress 'edit' in an interactive rebase as 'done'? Britton Kerin
2024-02-06 11:32 ` Oswald Buddenhagen
2024-02-06 19:45   ` Sergey Organov [this message]
2024-02-06 20:09   ` Britton Kerin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87il31s7g1.fsf@osv.gnss.ru \
    --to=sorganov@gmail.com \
    --cc=britton.kerin@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=oswald.buddenhagen@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.