diff options
| -rw-r--r-- | builtin-grep.c | 1 | ||||
| -rwxr-xr-x | t/t7002-grep.sh | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index e3eeb77cc7..a10946db3c 100644 --- 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 bf4d4dcb2b..918d33f7d1 100755 --- 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 && |