From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
jacob.keller@gmail.com,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v2 0/1] Make 'git commit' not accidentally lose staged content
Date: Sun, 16 Sep 2018 08:31:45 +0200 [thread overview]
Message-ID: <20180916063146.9850-1-pclouds@gmail.com> (raw)
In-Reply-To: <20180820154120.19297-1-pclouds@gmail.com>
This is about mixing "git add -p" and "git commit -a" (or "git commit
<path>") where you may accidentally lose staged changes. After the
discussion with Jonathan, I'm going with a bit different approach than
v1, this behavior now becomes default, and if the user wants the old
behavior back, they can use --clobber-index.
Another change is "git commit <path>" is covered as well, as pointed
out by Jacob.
I will need to add some test cases of course, if this direction is
still promising. One thing I'm not sure about is whether want to
deliberately clobber the index often, then perhaps we should add a
config key to bring the old behavior back.
Nguyễn Thái Ngọc Duy (1):
commit: do not clobber the index
Documentation/git-commit.txt | 11 +++-
builtin/commit.c | 105 ++++++++++++++++++++++++++++---
cache.h | 1 +
read-cache.c | 11 ++++
t/t2201-add-update-typechange.sh | 2 +-
t/t4015-diff-whitespace.sh | 2 +-
t/t7102-reset.sh | 2 +-
t/t7500-commit.sh | 2 +-
t/t7502-commit.sh | 4 +-
t/t9350-fast-export.sh | 2 +-
10 files changed, 126 insertions(+), 16 deletions(-)
--
2.19.0.rc0.337.ge906d732e7
next prev parent reply other threads:[~2018-09-16 6:34 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
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 ` Nguyễn Thái Ngọc Duy [this message]
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=20180916063146.9850-1-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=jrnieder@gmail.com \
--cc=sunshine@sunshineco.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).