git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] grep: fix grepping for "intent to add" files

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 16, 2016, 18:18 UTC
Message-ID
<xmqq37od576e.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<CACsJy8Bp6Mv2D1QCsR6MWhW2XMedo2svQKHBrx8AgA1Le56Grw@mail.gmail.com>
Duy Nguyen <pclouds@gmail.com> writes:
Show 21 quoted lines
>> 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.

OK, sounds like a good start for a proper log message for the fix. Thanks for hashing it all out before I got to the end of the thread ;-)

Previous: Duy Nguyen
Message 8 of 8 in “grep: fix grepping for "intent to add" files”
  1. grep: fix grepping for "intent to add" filesCharles Bailey, Jun 16, 2016
  2. Junio C HamanoJun 16, 2016
  3. Duy NguyenJun 16, 2016
  4. Charles BaileyJun 16, 2016
  5. Duy NguyenJun 16, 2016
  6. Charles BaileyJun 16, 2016
  7. Duy NguyenJun 16, 2016
  8. Junio C HamanoJun 16, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.