From: Victor Toni <victor.toni@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: Aborting git rebase --edit-todo
Date: Thu, 3 Sep 2020 21:32:09 +0200 [thread overview]
Message-ID: <CAG0OSgcUi6sKJQmUEd4-Lu5qAiQqKk7X7aSRvRtcBWkcKj4f1g@mail.gmail.com> (raw)
In-Reply-To: <xmqqa6y6ah8h.fsf@gitster.c.googlers.com>
> It is rather unusual (or almost always wrong) to have a totally
> empty commit log or initial todo list, so it is understandable for
> Git in these situations to stop without doing anything further.
>
> There is no other sensible interpretations of what you are telling
> Git to you by returning an empty buffer---it is extremely unlikely
> you want to create a commit with no log message (without explicitly
> allowing it with --allow-empty-message, the command is likely to
> fail anyway), and it is extremely unlikely that you wanted to just
> reset the tip of the branch to the --onto commit.
>
> Once an interactive rebase session has started and you are given the
> remainder of the steps to edit and you give an empty buffer back,
> however, there are two possible interpretations that are equally
> sensible, I would think.
>
> - One is that you are signaling that you are done with the rebase
> session and all the remaining commits are to be discarded.
>
> - The other is that you botched editing the todo list, and you wish
> Git to give you another chance to edit it again.
>
> I think the implementor chose the first interpretation. The "drop"
> insn is a relatively recent invention, and back when it was missing
> from the vocabulary, I do not think it was possible to say " discard
> all the rest" without emptying the todo list, so that design is
> understandable.
>
> Now we have the "drop" verb, the latter interpretation becomes
> possible without making it impossible for the user to express the
> former. It might be a good idea to
>
> (1) save away the original before allowing --edit-todo to edit,
>
> (2) open the editor, and
>
> (3) when getting an empty buffer back, go back to step (2) using
> the back-up made in step (1).
>
> Either way, the todo list editor buffer can have additional comment
> instructing what happens when the buffer is emptied.
>
Personally I would like to see your approach (1,2,3) implemented
because it is not destructive. If the user wants to achieve something
different he can retry.
Option / interpretation a)
> - One is that you are signaling that you are done with the rebase
> session and all the remaining commits are to be discarded.
is more difficult to recover from. (I'm still thankful for `.git/logs/HEAD`)
next prev parent reply other threads:[~2020-09-03 19:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 9:39 Aborting git rebase --edit-todo Victor Toni
2020-09-03 17:43 ` Junio C Hamano
2020-09-03 18:55 ` Carlo Arenas
2020-09-03 19:22 ` Victor Toni
2020-09-03 20:02 ` Junio C Hamano
2020-09-03 19:32 ` Victor Toni [this message]
2020-09-03 19:59 ` Carlo Arenas
2020-09-03 21:07 ` Victor Toni
2020-09-03 21:08 ` Junio C Hamano
2020-09-03 21:21 ` Victor Toni
2020-09-04 5:43 ` Johannes Schindelin
2020-09-06 21:52 ` Junio C Hamano
2020-09-04 5:42 ` Johannes Schindelin
2020-09-04 5:32 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAG0OSgcUi6sKJQmUEd4-Lu5qAiQqKk7X7aSRvRtcBWkcKj4f1g@mail.gmail.com \
--to=victor.toni@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).