[PATCH] grep: fix grepping for "intent to add" files
- From
Charles Bailey <charles@hashpling.org>
- Date
- Jun 16, 2016, 06:53 UTC
- Message-ID
- <20160616065324.GA14967@hashpling.org>
From: Charles Bailey <cbailey32@bloomberg.net>
This reverts commit 4d552005323034c1d6311796ac1074e9a4b4b57e.
This commit caused 'git grep' to no longer find matches in new files in the working tree where the corresponding index entry had the "intent to add" bit set.
Add tests to cover this case and a few related cases which previously lacked coverage.
Signed-off-by: Charles Bailey <cbailey32@bloomberg.net> ---
Originally discussed:
http://thread.gmane.org/gmane.comp.version-control.git/272363/focus=276358
http://thread.gmane.org/gmane.comp.version-control.git/283001/focus=283002
Unless I've misunderstood the conversation and commit message, the referenced commit was supposed to be a "code as a comment" commit with no change in observable behavior however a user was surprised that 'git grep' couldn't find something that regular grep could, despite the file being tracked - albeit new and "intended to add".
builtin/grep.c | 2 +- t/t7810-grep.sh | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/builtin/grep.c b/builtin/grep.c index 462e607..d5aacba 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -386,7 +386,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int for (nr = 0; nr < active_nr; nr++) { const struct cache_entry *ce = active_cache[nr]; - if (!S_ISREG(ce->ce_mode) || ce_intent_to_add(ce)) + if (!S_ISREG(ce->ce_mode)) continue; if (!ce_path_match(ce, pathspec, NULL)) continue; diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 1e72971..eae731a 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -1364,4 +1364,33 @@ test_expect_success 'grep --color -e A --and -e B -p with context' ' test_cmp expected actual ' +test_expect_success 'grep can find things only in the work tree' ' + touch work-tree-only && + git add work-tree-only && + echo "find in work tree" >work-tree-only && + git grep --quiet "find in work tree" && + test_must_fail git grep --quiet --cached "find in work tree" && + test_must_fail git grep --quiet "find in work tree" HEAD && + git rm -f work-tree-only +' + +test_expect_success 'grep can find things only in the work tree (i-t-a)' ' + echo "intend to add this" >intend-to-add && + git add -N intend-to-add && + git grep --quiet "intend to add this" && + test_must_fail git grep --quiet --cached "intend to add this" && + test_must_fail git grep --quiet "intend to add this" HEAD && + git rm -f intend-to-add +' + +test_expect_success 'grep can find things only in the index' ' + echo "only in the index" >cache-this && + git add cache-this && + rm cache-this && + test_must_fail git grep --quiet "only in the index" && + git grep --quiet --cached "only in the index" && + test_must_fail git grep --quiet "only in the index" HEAD && + git rm --cached cache-this +' + test_done
-- 2.8.2.311.gee88674