From: Jonathan Nieder <jrnieder@gmail.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH/RFC] commit: new option to abort -a something is already staged
Date: Mon, 20 Aug 2018 12:30:07 -0700 [thread overview]
Message-ID: <20180820193007.GB31020@aiede.svl.corp.google.com> (raw)
In-Reply-To: <20180820154120.19297-1-pclouds@gmail.com>
Hi,
Nguyễn Thái Ngọc Duy wrote:
> So many times I have carefully cherry picked changes to the index with
> `git add -p` then accidentally did `git commit -am ....` (usually by
> retrieving a command from history and pressing Enter too quickly)
> which destroyed beautiful index.
>
> One way to deal with this is some form of `git undo` that allows me to
> retrieve the old index.
Yes, I would love such an undo feature!
How would you imagine that this information would get stored? We can
start with adding that and a low-level (plumbing) interface to it, to
avoid being blocked on getting the user-facing (porcelain) "git undo"
interface right. (Or we can go straight for the porcelain. It's fine
for it to start minimal and gain switches later.)
[...]
> Instead, let's handle just this problem for now. This new option
> commit.preciousDirtyIndex, if set to false, will not allow `commit -a`
> to continue if the final index is different from the existing one. I
> don't think this can be achieved with hooks because the hooks don't
> know about "-a" or different commit modes.
I frequently use "git commit -a" this way intentionally, so I would be
unlikely to turn this config on. That leads me to suspect it's not a
good candidate for configuration:
- it's not configuration for the sake of a transition period, since some
people would keep it on forever
- it's not configuration based on different project needs, either
So configuration doesn't feel like a good fit.
It might be that I can switch my muscle memory to "git add -u && git
commit", in which case this could work as a new default without
configuration (or with configuration for a transition period). A
separate commandline option "git commit -a --no-clobber-index" might
make sense as well, since then I could pass --clobber-index to keep my
current workflow. That would also follow the usual progression:
introduce commandline option first, then config, then change default.
That said, I lean toward your initial thought, that this is papering
over a missing undo feature. Can you say more about how you'd imagine
undo working?
Thanks,
Jonathan
next prev parent reply other threads:[~2018-08-20 19:30 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-20 15:41 [PATCH/RFC] commit: new option to abort -a something is already staged Nguyễn Thái Ngọc Duy
2018-08-20 15:55 ` Junio C Hamano
2018-08-20 17:48 ` Eric Sunshine
2018-08-20 19:30 ` Jonathan Nieder [this message]
2018-08-21 14:43 ` Duy Nguyen
2018-08-23 2:11 ` Jonathan Nieder
2018-08-23 2:15 ` Jonathan Nieder
2018-08-23 14:49 ` Duy Nguyen
2018-08-23 15:28 ` Junio C Hamano
2018-08-24 3:02 ` Jacob Keller
2018-08-24 14:42 ` Duy Nguyen
2018-08-24 23:23 ` Jacob Keller
2018-08-24 2:59 ` Jacob Keller
2018-09-16 6:31 ` [PATCH v2 0/1] Make 'git commit' not accidentally lose staged content Nguyễn Thái Ngọc Duy
2018-09-16 6:31 ` [PATCH v2 1/1] commit: do not clobber the index Nguyễn Thái Ngọc Duy
2018-09-17 17:09 ` [PATCH v2 0/1] Make 'git commit' not accidentally lose staged content Junio C Hamano
2018-09-17 17:29 ` Duy Nguyen
2018-09-17 18:15 ` Jeff King
2018-09-17 18:41 ` Duy Nguyen
2018-09-18 17:35 ` Jeff King
2018-09-18 19:36 ` Jacob Keller
2018-09-18 23:19 ` Jeff King
2018-09-19 16:12 ` Duy Nguyen
2018-09-19 16:16 ` Jeff King
2018-09-17 19:26 ` Junio C Hamano
2018-09-18 19:41 ` Jacob Keller
2018-09-18 21:11 ` Eckhard Maaß
2018-09-18 19:33 ` Jacob Keller
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=20180820193007.GB31020@aiede.svl.corp.google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.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.
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).