grep --no-index: allow use of "git grep" outside a git repository
Just like some people wanted diff features that are not found in other people's diff implementations outside of a git repository and added --no-index mode to the command, this adds --no-index mode to the "git grep" command. Also, inside a git repository, --no-index mode allows you to grep in untracked (but not ignored) files. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
@ -426,4 +426,56 @@ test_expect_success 'grep -Fi' '
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'outside of git repository' '
|
||||
rm -fr non &&
|
||||
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
|
||||
} >non/expect.full &&
|
||||
echo file2:world >non/expect.sub
|
||||
(
|
||||
GIT_CEILING_DIRECTORIES="$(pwd)/non/git" &&
|
||||
export GIT_CEILING_DIRECTORIES &&
|
||||
cd non/git &&
|
||||
test_must_fail git grep o &&
|
||||
git grep --no-index o >../actual.full &&
|
||||
test_cmp ../expect.full ../actual.full
|
||||
cd sub &&
|
||||
test_must_fail git grep o &&
|
||||
git grep --no-index o >../../actual.sub &&
|
||||
test_cmp ../../expect.sub ../../actual.sub
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'inside git repository but with --no-index' '
|
||||
rm -fr is &&
|
||||
mkdir -p is/git/sub &&
|
||||
echo hello >is/git/file1 &&
|
||||
echo world >is/git/sub/file2 &&
|
||||
echo ".*o*" >is/git/.gitignore &&
|
||||
{
|
||||
echo file1:hello &&
|
||||
echo sub/file2:world
|
||||
} >is/expect.full &&
|
||||
: >is/expect.empty &&
|
||||
echo file2:world >is/expect.sub
|
||||
(
|
||||
cd is/git &&
|
||||
git init &&
|
||||
test_must_fail git grep o >../actual.full &&
|
||||
test_cmp ../expect.empty ../actual.full &&
|
||||
git grep --no-index o >../actual.full &&
|
||||
test_cmp ../expect.full ../actual.full &&
|
||||
cd sub &&
|
||||
test_must_fail git grep o >../../actual.sub &&
|
||||
test_cmp ../../expect.empty ../../actual.sub &&
|
||||
git grep --no-index o >../../actual.sub &&
|
||||
test_cmp ../../expect.sub ../../actual.sub
|
||||
)
|
||||
'
|
||||
|
||||
test_done
|
||||
|
Reference in New Issue
Block a user