grep --no-index: don't use git standard exclusions

The --no-index mode is intended to be used outside of a git repository, and
it does not make sense to apply the git standard exclusions outside a git
repositories.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-grep.c b/builtin-grep.c
index e3eeb77cc789796d659cbd9eb28af189bdcf4ee4..a10946db3c49797ef717734924416df0879b55a1 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -652,7 +652,6 @@ static int grep_directory(struct grep_opt *opt, const char **paths)
        int i, hit = 0;
 
        memset(&dir, 0, sizeof(dir));
-       setup_standard_excludes(&dir);
 
        fill_directory(&dir, paths);
        for (i = 0; i < dir.nr; i++) {

diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index bf4d4dcb2bc577715a02ae01f95a5be348e40384..918d33f7d1ab4d4d44dd6b13ca7e6029fe148ad5 100755 (executable)
--- a/t/t7002-grep.sh
+++ b/t/t7002-grep.sh
@@ -439,7 +439,6 @@ test_expect_success 'outside of git repository' '
        mkdir -p non/git/sub &&
        echo hello >non/git/file1 &&
        echo world >non/git/sub/file2 &&
-       echo ".*o*" >non/git/.gitignore &&
        {
                echo file1:hello &&
                echo sub/file2:world
@@ -466,6 +465,7 @@ test_expect_success 'inside git repository but with --no-index' '
        echo world >is/git/sub/file2 &&
        echo ".*o*" >is/git/.gitignore &&
        {
+               echo ".gitignore:.*o*" &&
                echo file1:hello &&
                echo sub/file2:world
        } >is/expect.full &&