git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eugene Sajine <euguess@gmail.com>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
	kusmabite@gmail.com, Wincent Colaiuta <win@wincent.com>,
	Avery Pennarun <apenwarr@gmail.com>,
	Jacob Helwig <jacob.helwig@gmail.com>,
	git@vger.kernel.org
Subject: Re: aborting rebase -i right at the start, was Re: [BUG] - "git  commit --amend" commits, when exiting the editor with no changes written
Date: Wed, 3 Feb 2010 11:02:35 -0500	[thread overview]
Message-ID: <76c5b8581002030802h7be8c1b2k6aa41ba7e9db0f2b@mail.gmail.com> (raw)
In-Reply-To: <20100203094144.GM15202@neumann>

2010/2/3 SZEDER Gábor <szeder@ira.uka.de>:
> On Wed, Feb 03, 2010 at 10:08:50AM +0100, Johannes Schindelin wrote:
>> Hi,
>>
>> On Wed, 3 Feb 2010, Matthieu Moy wrote:
>>
>> > Strictly speaking, an empty [rebase -i] todolist should mean to drop all
>> > the patches (like a todolist with just one line would mean to drop all
>> > the others). But a user never wants to do that (otherwise, "git reset"
>> > would be the right command), so "git rebase -i" considers it as a
>> > special case.
>>
>> Actually, it is a design bug, but it was the only sane way I could think
>> of aborting the rebase.
>>
>> Note that there _are_ users who want to do that ("let me see what commits
>> I have, ah, oh, okay, I want none of them"). I am one of those.
>
> I regularly mess up the todo file so badly that I don't want to bother
> with undo but rather start over from the beginning.
>
>
> Best,
> Gábor
>
>

I already described the solution which i think should be implemented
in old thread I will just repeat it here for easier tracking:

The solution should be as Avery proposed - to monitor file
modification timestamp as well as the content.
Timestamp should be remembered by git when editor is fired up and then
checked when you're exiting the editor. If it is the same - it means
that user canceled the whole operation by *not* confirming the file
content by save. If the timestamp is bigger than the saved one and the
message is not empty - we can proceed.

I.e. in case of rebase -i you will be able to abort the operation by
simply exiting the editor without save in any state at any moment and
start from the beginning.

Thanks,
Eugene

  reply	other threads:[~2010-02-03 16:02 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-02 20:07 [BUG] - "git commit --amend" commits, when exiting the editor with no changes written Eugene Sajine
2010-02-02 20:14 ` Jacob Helwig
2010-02-02 20:27   ` Avery Pennarun
2010-02-02 20:47     ` Eugene Sajine
2010-02-02 20:58       ` Wincent Colaiuta
2010-02-02 21:56         ` Eugene Sajine
2010-02-02 22:03           ` Erik Faye-Lund
2010-02-02 22:06           ` Wincent Colaiuta
2010-02-02 22:31             ` Eugene Sajine
2010-02-02 22:35               ` Avery Pennarun
2010-02-02 23:02                 ` Eugene Sajine
2010-02-02 23:15                   ` Johannes Schindelin
2010-02-02 23:27                     ` Eugene Sajine
2010-02-02 23:40                   ` Avery Pennarun
2010-02-03  6:15                     ` Larry D'Anna
2010-02-03  9:31                       ` Jeff King
2010-02-03 10:15                         ` Jeff King
2010-02-03 18:19                         ` Avery Pennarun
2010-02-02 23:00               ` Johannes Schindelin
2010-02-02 23:34                 ` Eugene Sajine
2010-02-02 23:40                   ` Erik Faye-Lund
2010-02-02 23:48                     ` Eugene Sajine
2010-02-03  0:16                       ` Erik Faye-Lund
2010-02-03  0:55                         ` Eugene Sajine
2010-02-03  1:59                           ` SZEDER Gábor
2010-02-03  7:34                             ` Matthieu Moy
2010-02-03  9:08                               ` aborting rebase -i right at the start, was " Johannes Schindelin
2010-02-03  9:41                                 ` SZEDER Gábor
2010-02-03 16:02                                   ` Eugene Sajine [this message]
2010-02-03  7:31                       ` Matthieu Moy
2010-02-03 15:45                         ` Eugene Sajine
2010-02-03 17:51                           ` Jonathan Nieder
2010-02-03 17:53                             ` Jonathan Nieder
2010-02-03 18:21                           ` Wincent Colaiuta
2010-02-03 18:49                             ` Eugene Sajine
2010-02-03 18:57                               ` Avery Pennarun
2010-02-03 19:27                                 ` Eugene Sajine
2010-02-03 19:54                                   ` Avery Pennarun
2010-02-03 18:47                           ` Matthieu Moy
2010-02-02 23:58                   ` Johannes Schindelin
2010-02-03  0:09                     ` Eugene Sajine
2010-02-03  9:04                       ` Johannes Schindelin
2010-02-03  9:46                       ` Paolo Bonzini
2010-02-02 23:44                 ` Junio C Hamano
2010-02-02 21:18       ` Avery Pennarun

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=76c5b8581002030802h7be8c1b2k6aa41ba7e9db0f2b@mail.gmail.com \
    --to=euguess@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=apenwarr@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jacob.helwig@gmail.com \
    --cc=kusmabite@gmail.com \
    --cc=szeder@ira.uka.de \
    --cc=win@wincent.com \
    /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 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 NNTP newsgroup(s).