From: Charles Bailey Date: Thu, 30 Jun 2016 10:13:45 GMT Subject: [PATCH v3 0/3] Grepping with intent to add Message-ID: <20160630101348.15665-1-charles@hashpling.org> 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