From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: Britton Kerin <britton.kerin@gmail.com>
Cc: 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, 6 Feb 2024 12:32:31 +0100 [thread overview]
Message-ID: <ZcIYz82iLxPOVR9Q@ugly> (raw)
In-Reply-To: <CAC4O8c_oKT+a0hm+tqSOG7d1=AuJJKy5bsh72cJKVsWynvHw+w@mail.gmail.com>
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.
next prev parent reply other threads:[~2024-02-06 11:32 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 [this message]
2024-02-06 19:45 ` Sergey Organov
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=ZcIYz82iLxPOVR9Q@ugly \
--to=oswald.buddenhagen@gmx.de \
--cc=britton.kerin@gmail.com \
--cc=git@vger.kernel.org \
/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.