From: Duy Nguyen <pclouds@gmail.com>
To: Charles Bailey <charles@hashpling.org>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] grep: fix grepping for "intent to add" files
Date: Thu, 16 Jun 2016 17:57:18 +0700 [thread overview]
Message-ID: <CACsJy8Bp6Mv2D1QCsR6MWhW2XMedo2svQKHBrx8AgA1Le56Grw@mail.gmail.com> (raw)
In-Reply-To: <20160616094749.GA20681@hashpling.org>
On Thu, Jun 16, 2016 at 4:47 PM, Charles Bailey <charles@hashpling.org> wrote:
> On Thu, Jun 16, 2016 at 02:47:09PM +0700, Duy Nguyen wrote:
>> I don't think revert is right. It rather needs a re-fix like below.
>> Basically we want grep_file() to run as normal, but grep_sha1()
>> (i.e. git grep --cached) should ignore i-t-a entries, because empty
>> SHA-1 is not the right content to grep. It does not matter in positive
>> matching, sure, but it may in -v cache.
>
> You don't think the revert is correct or you don't think the revert is
> sufficient? (I wasn't able to find a test case which proved that the
> change to line 399 was necessary, so perhaps I don't understand.)
OK insufficient.
> I would have thought that grepping the empty SHA-1 would be correct for
> with or without -v. An "intent to add" file has no content in the index
> so I would expect it to have zero matching and zero non-matching lines
> for any grep --cached query?
>
> Or is this an efficiency and not a correctness concern?
"git grep --cached" searches file content that will be committed by
"git commit" (no -a). An i-t-a entry will not be committed (you would
need "git add" first, or do "git commit -a"). So if I say "search
among the to-be-committed file content, list files that do not match
abc" (git grep -l -v --cached abc), the i-t-a entry will show up
because its fake content is empty (i.e. not contain "abc"), even
though it's not in the "to-be-committed" list. So yeah, correctness
issue.
--
Duy
next prev parent reply other threads:[~2016-06-16 10:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-16 6:53 [PATCH] grep: fix grepping for "intent to add" files Charles Bailey
2016-06-16 7:47 ` Duy Nguyen
2016-06-16 9:47 ` Charles Bailey
2016-06-16 10:57 ` Duy Nguyen [this message]
2016-06-16 11:44 ` Charles Bailey
2016-06-16 12:11 ` Duy Nguyen
2016-06-16 18:18 ` Junio C Hamano
2016-06-16 18:12 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACsJy8Bp6Mv2D1QCsR6MWhW2XMedo2svQKHBrx8AgA1Le56Grw@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).