From: Charles Bailey <charles@hashpling.org>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v3 0/3] Grepping with intent to add
Date: Thu, 30 Jun 2016 11:13:45 +0100 [thread overview]
Message-ID: <20160630101348.15665-1-charles@hashpling.org> (raw)
So I've got back around to this topic again.
I've applied fixes to the tests as suggested by Eric and Junio.
I came up with a test case that demonstrates a difference between the
additional fix that Duy suggested and the alternative that Junio
suggested.
I've kept Duy's fix because I think it makes more sense, although it's
a sufficiently obscure case that I don't feel strongly that it's
definitely the best behavior.
The fix ensures that if you have a file which is both "intend to add"
and "assume unchanged" that it is not listed if you "grep -L" for for
something. In effect, we are applying the "contents indeterminate" state
of the index to the working tree file.
Charles Bailey (3):
t7810-grep.sh: fix duplicated test name
t7810-grep.sh: fix a whitespace inconsistency
grep: fix grepping for "intent to add" files
builtin/grep.c | 4 ++--
t/t7810-grep.sh | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 62 insertions(+), 4 deletions(-)
--
2.8.2.311.gee88674
next reply other threads:[~2016-06-30 10:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-30 10:13 Charles Bailey [this message]
2016-06-30 10:13 ` [PATCH v3 1/3] t7810-grep.sh: fix duplicated test name Charles Bailey
2016-07-01 20:27 ` Junio C Hamano
2016-06-30 10:13 ` [PATCH v3 2/3] t7810-grep.sh: fix a whitespace inconsistency Charles Bailey
2016-06-30 10:13 ` [PATCH v3 3/3] grep: fix grepping for "intent to add" files Charles Bailey
2016-07-01 20:34 ` Junio C Hamano
2016-07-01 20:26 ` [PATCH v3 0/3] Grepping with intent to add Junio C Hamano
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=20160630101348.15665-1-charles@hashpling.org \
--to=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@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).