Re: [PATCH 2/3] git-gui: Add the ability to revert selected lines
- From
Pratyush Yadav <me@yadavpratyush.com>
- Date
- Aug 21, 2019, 21:48 UTC
- Message-ID
- <20190821214829.2dzat2quo3h2s3z2@localhost.localdomain>
- In-Reply-To
- <93095b5a-6e15-ce4a-eb9b-22f9528312e1@kdbg.org>
On 20/08/19 11:19PM, Johannes Sixt wrote:
Show 16 quoted lines
> Am 20.08.19 um 21:29 schrieb Pratyush Yadav: > > On 20/08/19 09:21PM, Johannes Sixt wrote: > >> Please don't do this. This confirmation dialog is unacceptable in my > >> workflow. I use reversals of hunks and lines frequently, almost like a > >> secondary code editor. My safety net is the undo function of the IDE, > >> which works across reloads that are triggered by these external edits. > >> These confirmations get in the way. > > > > But not everyone uses an IDE. I use vim and it does not have any such > > undo feature that works across reloads. Not one I'm aware of anyway. It > > is absolutely necessary IMO to ask the user for confirmation before > > deleting their work, unless we have a built in safety net. > > But you have a safety net built-in: Commit the work, then do the > reversals in amend-mode. Now you can recover old state to your heart's > content. That's recommended anyway if stuff is potentially precious.
I suppose we disagree on this. I feel very uncomfortable removing the prompt by default, because it is pretty easy to mis-click revert instead of stage, and all of a sudden lots of your work is gone. It is a pretty common workflow to make some changes, stage some hunks in one commit and then some others in the next. Not everyone (including me) will first commit changes, then amend them, especially if they are not that big or complicated. Accidentally deleting your work, no matter how small, because of a misclick sucks.
So, I feel strongly in favor of keeping the prompt on by default. I will add a config option to disable it for people who are willing to accept misclicks. That keeps both sides of the argument happy. You just have to disable it once in your global config and you're good to go.
Show 7 quoted lines
> > So how about adding a config option that allows you to disable the > > confirmation dialog? Sounds like a reasonable compromise to me. > > That's always an option. Needless to say that I'd prefer it off by > default; I don't need three safety nets. > > -- Hannes
-- Regards, Pratyush Yadav