a449f27ffa
Teach 'git-grep(1)' a new option, '--column', to show the column number of the first match on a non-context line. This makes it possible to teach 'contrib/git-jump/git-jump' how to seek to the first matching position of a grep match in your editor, and allows similar additional scripting capabilities. For example: $ git grep -n --column foo | head -n3 .clang-format:51:14:# myFunction(foo, bar, baz); .clang-format:64:7:# int foo(); .clang-format:75:8:# void foo() Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1689 lines
42 KiB
Bash
Executable File
1689 lines
42 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Junio C Hamano
|
|
#
|
|
|
|
test_description='git grep various.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
cat >hello.c <<EOF
|
|
#include <assert.h>
|
|
#include <stdio.h>
|
|
|
|
int main(int argc, const char **argv)
|
|
{
|
|
printf("Hello world.\n");
|
|
return 0;
|
|
/* char ?? */
|
|
}
|
|
EOF
|
|
|
|
test_expect_success setup '
|
|
{
|
|
echo foo mmap bar
|
|
echo foo_mmap bar
|
|
echo foo_mmap bar mmap
|
|
echo foo mmap bar_mmap
|
|
echo foo_mmap bar mmap baz
|
|
} >file &&
|
|
{
|
|
echo Hello world
|
|
echo HeLLo world
|
|
echo Hello_world
|
|
echo HeLLo_world
|
|
} >hello_world &&
|
|
{
|
|
echo "a+b*c"
|
|
echo "a+bc"
|
|
echo "abc"
|
|
} >ab &&
|
|
{
|
|
echo d &&
|
|
echo 0
|
|
} >d0 &&
|
|
echo vvv >v &&
|
|
echo ww w >w &&
|
|
echo x x xx x >x &&
|
|
echo y yy >y &&
|
|
echo zzz > z &&
|
|
mkdir t &&
|
|
echo test >t/t &&
|
|
echo vvv >t/v &&
|
|
mkdir t/a &&
|
|
echo vvv >t/a/v &&
|
|
{
|
|
echo "line without leading space1"
|
|
echo " line with leading space1"
|
|
echo " line with leading space2"
|
|
echo " line with leading space3"
|
|
echo "line without leading space2"
|
|
} >space &&
|
|
cat >hello.ps1 <<-\EOF &&
|
|
# No-op.
|
|
function dummy() {}
|
|
|
|
# Say hello.
|
|
function hello() {
|
|
echo "Hello world."
|
|
} # hello
|
|
|
|
# Still a no-op.
|
|
function dummy() {}
|
|
EOF
|
|
git add . &&
|
|
test_tick &&
|
|
git commit -m initial
|
|
'
|
|
|
|
test_expect_success 'grep should not segfault with a bad input' '
|
|
test_must_fail git grep "("
|
|
'
|
|
|
|
for H in HEAD ''
|
|
do
|
|
case "$H" in
|
|
HEAD) HC='HEAD:' L='HEAD' ;;
|
|
'') HC= L='in working tree' ;;
|
|
esac
|
|
|
|
test_expect_success "grep -w $L" '
|
|
{
|
|
echo ${HC}file:1:foo mmap bar
|
|
echo ${HC}file:3:foo_mmap bar mmap
|
|
echo ${HC}file:4:foo mmap bar_mmap
|
|
echo ${HC}file:5:foo_mmap bar mmap baz
|
|
} >expected &&
|
|
git -c grep.linenumber=false grep -n -w -e mmap $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -w $L (with --column)" '
|
|
{
|
|
echo ${HC}file:5:foo mmap bar
|
|
echo ${HC}file:14:foo_mmap bar mmap
|
|
echo ${HC}file:5:foo mmap bar_mmap
|
|
echo ${HC}file:14:foo_mmap bar mmap baz
|
|
} >expected &&
|
|
git grep --column -w -e mmap $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -w $L (with --column, extended OR)" '
|
|
{
|
|
echo ${HC}file:14:foo_mmap bar mmap
|
|
echo ${HC}file:19:foo_mmap bar mmap baz
|
|
} >expected &&
|
|
git grep --column -w -e mmap$ --or -e baz $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -w $L (with --column, --invert)" '
|
|
{
|
|
echo ${HC}file:1:foo mmap bar
|
|
echo ${HC}file:1:foo_mmap bar
|
|
echo ${HC}file:1:foo_mmap bar mmap
|
|
echo ${HC}file:1:foo mmap bar_mmap
|
|
} >expected &&
|
|
git grep --column --invert -w -e baz $H -- file >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L (with --column, --invert, extended OR)" '
|
|
{
|
|
echo ${HC}hello_world:6:HeLLo_world
|
|
} >expected &&
|
|
git grep --column --invert -e ll --or --not -e _ $H -- hello_world \
|
|
>actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L (with --column, --invert, extended AND)" '
|
|
{
|
|
echo ${HC}hello_world:3:Hello world
|
|
echo ${HC}hello_world:3:Hello_world
|
|
echo ${HC}hello_world:6:HeLLo_world
|
|
} >expected &&
|
|
git grep --column --invert --not -e _ --and --not -e ll $H -- hello_world \
|
|
>actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L (with --column, double-negation)" '
|
|
{
|
|
echo ${HC}file:1:foo_mmap bar mmap baz
|
|
} >expected &&
|
|
git grep --column --not \( --not -e foo --or --not -e baz \) $H -- file \
|
|
>actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -w $L (with --column, -C)" '
|
|
{
|
|
echo ${HC}file:5:foo mmap bar
|
|
echo ${HC}file-foo_mmap bar
|
|
echo ${HC}file:14:foo_mmap bar mmap
|
|
echo ${HC}file:5:foo mmap bar_mmap
|
|
echo ${HC}file:14:foo_mmap bar mmap baz
|
|
} >expected &&
|
|
git grep --column -w -C1 -e mmap $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -w $L (with --line-number, --column)" '
|
|
{
|
|
echo ${HC}file:1:5:foo mmap bar
|
|
echo ${HC}file:3:14:foo_mmap bar mmap
|
|
echo ${HC}file:4:5:foo mmap bar_mmap
|
|
echo ${HC}file:5:14:foo_mmap bar mmap baz
|
|
} >expected &&
|
|
git grep -n --column -w -e mmap $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -w $L (with non-extended patterns, --column)" '
|
|
{
|
|
echo ${HC}file:5:foo mmap bar
|
|
echo ${HC}file:10:foo_mmap bar
|
|
echo ${HC}file:10:foo_mmap bar mmap
|
|
echo ${HC}file:5:foo mmap bar_mmap
|
|
echo ${HC}file:10:foo_mmap bar mmap baz
|
|
} >expected &&
|
|
git grep --column -w -e bar -e mmap $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -w $L" '
|
|
{
|
|
echo ${HC}file:1:foo mmap bar
|
|
echo ${HC}file:3:foo_mmap bar mmap
|
|
echo ${HC}file:4:foo mmap bar_mmap
|
|
echo ${HC}file:5:foo_mmap bar mmap baz
|
|
} >expected &&
|
|
git -c grep.linenumber=true grep -w -e mmap $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -w $L" '
|
|
{
|
|
echo ${HC}file:foo mmap bar
|
|
echo ${HC}file:foo_mmap bar mmap
|
|
echo ${HC}file:foo mmap bar_mmap
|
|
echo ${HC}file:foo_mmap bar mmap baz
|
|
} >expected &&
|
|
git -c grep.linenumber=true grep --no-line-number -w -e mmap $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -w $L (w)" '
|
|
: >expected &&
|
|
test_must_fail git grep -n -w -e "^w" $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -w $L (x)" '
|
|
{
|
|
echo ${HC}x:1:x x xx x
|
|
} >expected &&
|
|
git grep -n -w -e "x xx* x" $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -w $L (y-1)" '
|
|
{
|
|
echo ${HC}y:1:y yy
|
|
} >expected &&
|
|
git grep -n -w -e "^y" $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -w $L (y-2)" '
|
|
: >expected &&
|
|
if git grep -n -w -e "^y y" $H >actual
|
|
then
|
|
echo should not have matched
|
|
cat actual
|
|
false
|
|
else
|
|
test_cmp expected actual
|
|
fi
|
|
'
|
|
|
|
test_expect_success "grep -w $L (z)" '
|
|
: >expected &&
|
|
if git grep -n -w -e "^z" $H >actual
|
|
then
|
|
echo should not have matched
|
|
cat actual
|
|
false
|
|
else
|
|
test_cmp expected actual
|
|
fi
|
|
'
|
|
|
|
test_expect_success "grep $L (t-1)" '
|
|
echo "${HC}t/t:1:test" >expected &&
|
|
git grep -n -e test $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L (t-2)" '
|
|
echo "${HC}t:1:test" >expected &&
|
|
(
|
|
cd t &&
|
|
git grep -n -e test $H
|
|
) >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L (t-3)" '
|
|
echo "${HC}t/t:1:test" >expected &&
|
|
(
|
|
cd t &&
|
|
git grep --full-name -n -e test $H
|
|
) >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep -c $L (no /dev/null)" '
|
|
! git grep -c test $H | grep /dev/null
|
|
'
|
|
|
|
test_expect_success "grep --max-depth -1 $L" '
|
|
{
|
|
echo ${HC}t/a/v:1:vvv
|
|
echo ${HC}t/v:1:vvv
|
|
echo ${HC}v:1:vvv
|
|
} >expected &&
|
|
git grep --max-depth -1 -n -e vvv $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep --max-depth 0 $L" '
|
|
{
|
|
echo ${HC}v:1:vvv
|
|
} >expected &&
|
|
git grep --max-depth 0 -n -e vvv $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep --max-depth 0 -- '*' $L" '
|
|
{
|
|
echo ${HC}t/a/v:1:vvv
|
|
echo ${HC}t/v:1:vvv
|
|
echo ${HC}v:1:vvv
|
|
} >expected &&
|
|
git grep --max-depth 0 -n -e vvv $H -- "*" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep --max-depth 1 $L" '
|
|
{
|
|
echo ${HC}t/v:1:vvv
|
|
echo ${HC}v:1:vvv
|
|
} >expected &&
|
|
git grep --max-depth 1 -n -e vvv $H >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep --max-depth 0 -- t $L" '
|
|
{
|
|
echo ${HC}t/v:1:vvv
|
|
} >expected &&
|
|
git grep --max-depth 0 -n -e vvv $H -- t >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep --max-depth 0 -- . t $L" '
|
|
{
|
|
echo ${HC}t/v:1:vvv
|
|
echo ${HC}v:1:vvv
|
|
} >expected &&
|
|
git grep --max-depth 0 -n -e vvv $H -- . t >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep --max-depth 0 -- t . $L" '
|
|
{
|
|
echo ${HC}t/v:1:vvv
|
|
echo ${HC}v:1:vvv
|
|
} >expected &&
|
|
git grep --max-depth 0 -n -e vvv $H -- t . >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
test_expect_success "grep $L with grep.extendedRegexp=false" '
|
|
echo "${HC}ab:a+bc" >expected &&
|
|
git -c grep.extendedRegexp=false grep "a+b*c" $H ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L with grep.extendedRegexp=true" '
|
|
echo "${HC}ab:abc" >expected &&
|
|
git -c grep.extendedRegexp=true grep "a+b*c" $H ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L with grep.patterntype=basic" '
|
|
echo "${HC}ab:a+bc" >expected &&
|
|
git -c grep.patterntype=basic grep "a+b*c" $H ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L with grep.patterntype=extended" '
|
|
echo "${HC}ab:abc" >expected &&
|
|
git -c grep.patterntype=extended grep "a+b*c" $H ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L with grep.patterntype=fixed" '
|
|
echo "${HC}ab:a+b*c" >expected &&
|
|
git -c grep.patterntype=fixed grep "a+b*c" $H ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success PCRE "grep $L with grep.patterntype=perl" '
|
|
echo "${HC}ab:a+b*c" >expected &&
|
|
git -c grep.patterntype=perl grep "a\x{2b}b\x{2a}c" $H ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success !PCRE "grep $L with grep.patterntype=perl errors without PCRE" '
|
|
test_must_fail git -c grep.patterntype=perl grep "foo.*bar"
|
|
'
|
|
|
|
test_expect_success "grep $L with grep.patternType=default and grep.extendedRegexp=true" '
|
|
echo "${HC}ab:abc" >expected &&
|
|
git \
|
|
-c grep.patternType=default \
|
|
-c grep.extendedRegexp=true \
|
|
grep "a+b*c" $H ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L with grep.extendedRegexp=true and grep.patternType=default" '
|
|
echo "${HC}ab:abc" >expected &&
|
|
git \
|
|
-c grep.extendedRegexp=true \
|
|
-c grep.patternType=default \
|
|
grep "a+b*c" $H ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L with grep.patternType=extended and grep.extendedRegexp=false" '
|
|
echo "${HC}ab:abc" >expected &&
|
|
git \
|
|
-c grep.patternType=extended \
|
|
-c grep.extendedRegexp=false \
|
|
grep "a+b*c" $H ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L with grep.patternType=basic and grep.extendedRegexp=true" '
|
|
echo "${HC}ab:a+bc" >expected &&
|
|
git \
|
|
-c grep.patternType=basic \
|
|
-c grep.extendedRegexp=true \
|
|
grep "a+b*c" $H ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L with grep.extendedRegexp=false and grep.patternType=extended" '
|
|
echo "${HC}ab:abc" >expected &&
|
|
git \
|
|
-c grep.extendedRegexp=false \
|
|
-c grep.patternType=extended \
|
|
grep "a+b*c" $H ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep $L with grep.extendedRegexp=true and grep.patternType=basic" '
|
|
echo "${HC}ab:a+bc" >expected &&
|
|
git \
|
|
-c grep.extendedRegexp=true \
|
|
-c grep.patternType=basic \
|
|
grep "a+b*c" $H ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep --count $L" '
|
|
echo ${HC}ab:3 >expected &&
|
|
git grep --count -e b $H -- ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success "grep --count -h $L" '
|
|
echo 3 >expected &&
|
|
git grep --count -h -e b $H -- ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
done
|
|
|
|
cat >expected <<EOF
|
|
file
|
|
EOF
|
|
test_expect_success 'grep -l -C' '
|
|
git grep -l -C1 foo >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
file:5
|
|
EOF
|
|
test_expect_success 'grep -c -C' '
|
|
git grep -c -C1 foo >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep -L -C' '
|
|
git ls-files >expected &&
|
|
git grep -L -C1 nonexistent_string >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep --files-without-match --quiet' '
|
|
git grep --files-without-match --quiet nonexistent_string >actual &&
|
|
test_cmp /dev/null actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
file:foo mmap bar_mmap
|
|
EOF
|
|
|
|
test_expect_success 'grep -e A --and -e B' '
|
|
git grep -e "foo mmap" --and -e bar_mmap >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
file:foo_mmap bar mmap
|
|
file:foo_mmap bar mmap baz
|
|
EOF
|
|
|
|
|
|
test_expect_success 'grep ( -e A --or -e B ) --and -e B' '
|
|
git grep \( -e foo_ --or -e baz \) \
|
|
--and -e " mmap" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
file:foo mmap bar
|
|
EOF
|
|
|
|
test_expect_success 'grep -e A --and --not -e B' '
|
|
git grep -e "foo mmap" --and --not -e bar_mmap >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep should ignore GREP_OPTIONS' '
|
|
GREP_OPTIONS=-v git grep " mmap bar\$" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep -f, non-existent file' '
|
|
test_must_fail git grep -f patterns
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
file:foo mmap bar
|
|
file:foo_mmap bar
|
|
file:foo_mmap bar mmap
|
|
file:foo mmap bar_mmap
|
|
file:foo_mmap bar mmap baz
|
|
EOF
|
|
|
|
cat >pattern <<EOF
|
|
mmap
|
|
EOF
|
|
|
|
test_expect_success 'grep -f, one pattern' '
|
|
git grep -f pattern >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
file:foo mmap bar
|
|
file:foo_mmap bar
|
|
file:foo_mmap bar mmap
|
|
file:foo mmap bar_mmap
|
|
file:foo_mmap bar mmap baz
|
|
t/a/v:vvv
|
|
t/v:vvv
|
|
v:vvv
|
|
EOF
|
|
|
|
cat >patterns <<EOF
|
|
mmap
|
|
vvv
|
|
EOF
|
|
|
|
test_expect_success 'grep -f, multiple patterns' '
|
|
git grep -f patterns >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep, multiple patterns' '
|
|
git grep "$(cat patterns)" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
file:foo mmap bar
|
|
file:foo_mmap bar
|
|
file:foo_mmap bar mmap
|
|
file:foo mmap bar_mmap
|
|
file:foo_mmap bar mmap baz
|
|
t/a/v:vvv
|
|
t/v:vvv
|
|
v:vvv
|
|
EOF
|
|
|
|
cat >patterns <<EOF
|
|
|
|
mmap
|
|
|
|
vvv
|
|
|
|
EOF
|
|
|
|
test_expect_success 'grep -f, ignore empty lines' '
|
|
git grep -f patterns >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep -f, ignore empty lines, read patterns from stdin' '
|
|
git grep -f - <patterns >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
y:y yy
|
|
--
|
|
z:zzz
|
|
EOF
|
|
|
|
test_expect_success 'grep -q, silently report matches' '
|
|
>empty &&
|
|
git grep -q mmap >actual &&
|
|
test_cmp empty actual &&
|
|
test_must_fail git grep -q qfwfq >actual &&
|
|
test_cmp empty actual
|
|
'
|
|
|
|
test_expect_success 'grep -C1 hunk mark between files' '
|
|
git grep -C1 "^[yz]" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'log grep setup' '
|
|
echo a >>file &&
|
|
test_tick &&
|
|
GIT_AUTHOR_NAME="With * Asterisk" \
|
|
GIT_AUTHOR_EMAIL="xyzzy@frotz.com" \
|
|
git commit -a -m "second" &&
|
|
|
|
echo a >>file &&
|
|
test_tick &&
|
|
git commit -a -m "third" &&
|
|
|
|
echo a >>file &&
|
|
test_tick &&
|
|
GIT_AUTHOR_NAME="Night Fall" \
|
|
GIT_AUTHOR_EMAIL="nitfol@frobozz.com" \
|
|
git commit -a -m "fourth"
|
|
'
|
|
|
|
test_expect_success 'log grep (1)' '
|
|
git log --author=author --pretty=tformat:%s >actual &&
|
|
{
|
|
echo third && echo initial
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log grep (2)' '
|
|
git log --author=" * " -F --pretty=tformat:%s >actual &&
|
|
{
|
|
echo second
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log grep (3)' '
|
|
git log --author="^A U" --pretty=tformat:%s >actual &&
|
|
{
|
|
echo third && echo initial
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log grep (4)' '
|
|
git log --author="frotz\.com>$" --pretty=tformat:%s >actual &&
|
|
{
|
|
echo second
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log grep (5)' '
|
|
git log --author=Thor -F --pretty=tformat:%s >actual &&
|
|
{
|
|
echo third && echo initial
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log grep (6)' '
|
|
git log --author=-0700 --pretty=tformat:%s >actual &&
|
|
>expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log grep (7)' '
|
|
git log -g --grep-reflog="commit: third" --pretty=tformat:%s >actual &&
|
|
echo third >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log grep (8)' '
|
|
git log -g --grep-reflog="commit: third" --grep-reflog="commit: second" --pretty=tformat:%s >actual &&
|
|
{
|
|
echo third && echo second
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log grep (9)' '
|
|
git log -g --grep-reflog="commit: third" --author="Thor" --pretty=tformat:%s >actual &&
|
|
echo third >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log grep (9)' '
|
|
git log -g --grep-reflog="commit: third" --author="non-existent" --pretty=tformat:%s >actual &&
|
|
: >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --grep-reflog can only be used under -g' '
|
|
test_must_fail git log --grep-reflog="commit: third"
|
|
'
|
|
|
|
test_expect_success 'log with multiple --grep uses union' '
|
|
git log --grep=i --grep=r --format=%s >actual &&
|
|
{
|
|
echo fourth && echo third && echo initial
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --all-match with multiple --grep uses intersection' '
|
|
git log --all-match --grep=i --grep=r --format=%s >actual &&
|
|
{
|
|
echo third
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log with multiple --author uses union' '
|
|
git log --author="Thor" --author="Aster" --format=%s >actual &&
|
|
{
|
|
echo third && echo second && echo initial
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --all-match with multiple --author still uses union' '
|
|
git log --all-match --author="Thor" --author="Aster" --format=%s >actual &&
|
|
{
|
|
echo third && echo second && echo initial
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --grep --author uses intersection' '
|
|
# grep matches only third and fourth
|
|
# author matches only initial and third
|
|
git log --author="A U Thor" --grep=r --format=%s >actual &&
|
|
{
|
|
echo third
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --grep --grep --author takes union of greps and intersects with author' '
|
|
# grep matches initial and second but not third
|
|
# author matches only initial and third
|
|
git log --author="A U Thor" --grep=s --grep=l --format=%s >actual &&
|
|
{
|
|
echo initial
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log ---all-match -grep --author --author still takes union of authors and intersects with grep' '
|
|
# grep matches only initial and third
|
|
# author matches all but second
|
|
git log --all-match --author="Thor" --author="Night" --grep=i --format=%s >actual &&
|
|
{
|
|
echo third && echo initial
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --grep --author --author takes union of authors and intersects with grep' '
|
|
# grep matches only initial and third
|
|
# author matches all but second
|
|
git log --author="Thor" --author="Night" --grep=i --format=%s >actual &&
|
|
{
|
|
echo third && echo initial
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --all-match --grep --grep --author takes intersection' '
|
|
# grep matches only third
|
|
# author matches only initial and third
|
|
git log --all-match --author="A U Thor" --grep=i --grep=r --format=%s >actual &&
|
|
{
|
|
echo third
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --author does not search in timestamp' '
|
|
: >expect &&
|
|
git log --author="$GIT_AUTHOR_DATE" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --committer does not search in timestamp' '
|
|
: >expect &&
|
|
git log --committer="$GIT_COMMITTER_DATE" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep with CE_VALID file' '
|
|
git update-index --assume-unchanged t/t &&
|
|
rm t/t &&
|
|
test "$(git grep test)" = "t/t:test" &&
|
|
git update-index --no-assume-unchanged t/t &&
|
|
git checkout t/t
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
hello.c=#include <stdio.h>
|
|
hello.c: return 0;
|
|
EOF
|
|
|
|
test_expect_success 'grep -p with userdiff' '
|
|
git config diff.custom.funcname "^#" &&
|
|
echo "hello.c diff=custom" >.gitattributes &&
|
|
git grep -p return >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
hello.c=int main(int argc, const char **argv)
|
|
hello.c: return 0;
|
|
EOF
|
|
|
|
test_expect_success 'grep -p' '
|
|
rm -f .gitattributes &&
|
|
git grep -p return >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
hello.c-#include <stdio.h>
|
|
hello.c-
|
|
hello.c=int main(int argc, const char **argv)
|
|
hello.c-{
|
|
hello.c- printf("Hello world.\n");
|
|
hello.c: return 0;
|
|
EOF
|
|
|
|
test_expect_success 'grep -p -B5' '
|
|
git grep -p -B5 return >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
hello.c=int main(int argc, const char **argv)
|
|
hello.c-{
|
|
hello.c- printf("Hello world.\n");
|
|
hello.c: return 0;
|
|
hello.c- /* char ?? */
|
|
hello.c-}
|
|
EOF
|
|
|
|
test_expect_success 'grep -W' '
|
|
git grep -W return >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
hello.c-#include <assert.h>
|
|
hello.c:#include <stdio.h>
|
|
EOF
|
|
|
|
test_expect_success 'grep -W shows no trailing empty lines' '
|
|
git grep -W stdio >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep -W with userdiff' '
|
|
test_when_finished "rm -f .gitattributes" &&
|
|
git config diff.custom.xfuncname "^function .*$" &&
|
|
echo "hello.ps1 diff=custom" >.gitattributes &&
|
|
git grep -W echo >function-context-userdiff-actual
|
|
'
|
|
|
|
test_expect_success ' includes preceding comment' '
|
|
grep "# Say hello" function-context-userdiff-actual
|
|
'
|
|
|
|
test_expect_success ' includes function line' '
|
|
grep "=function hello" function-context-userdiff-actual
|
|
'
|
|
|
|
test_expect_success ' includes matching line' '
|
|
grep ": echo" function-context-userdiff-actual
|
|
'
|
|
|
|
test_expect_success ' includes last line of the function' '
|
|
grep "} # hello" function-context-userdiff-actual
|
|
'
|
|
|
|
for threads in $(test_seq 0 10)
|
|
do
|
|
test_expect_success "grep --threads=$threads & -c grep.threads=$threads" "
|
|
git grep --threads=$threads . >actual.$threads &&
|
|
if test $threads -ge 1
|
|
then
|
|
test_cmp actual.\$(($threads - 1)) actual.$threads
|
|
fi &&
|
|
git -c grep.threads=$threads grep . >actual.$threads &&
|
|
if test $threads -ge 1
|
|
then
|
|
test_cmp actual.\$(($threads - 1)) actual.$threads
|
|
fi
|
|
"
|
|
done
|
|
|
|
test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'grep --threads=N or pack.threads=N warns when no pthreads' '
|
|
git grep --threads=2 Hello hello_world 2>err &&
|
|
grep ^warning: err >warnings &&
|
|
test_line_count = 1 warnings &&
|
|
grep -F "no threads support, ignoring --threads" err &&
|
|
git -c grep.threads=2 grep Hello hello_world 2>err &&
|
|
grep ^warning: err >warnings &&
|
|
test_line_count = 1 warnings &&
|
|
grep -F "no threads support, ignoring grep.threads" err &&
|
|
git -c grep.threads=2 grep --threads=4 Hello hello_world 2>err &&
|
|
grep ^warning: err >warnings &&
|
|
test_line_count = 2 warnings &&
|
|
grep -F "no threads support, ignoring --threads" err &&
|
|
grep -F "no threads support, ignoring grep.threads" err &&
|
|
git -c grep.threads=0 grep --threads=0 Hello hello_world 2>err &&
|
|
test_line_count = 0 err
|
|
'
|
|
|
|
test_expect_success 'grep from a subdirectory to search wider area (1)' '
|
|
mkdir -p s &&
|
|
(
|
|
cd s && git grep "x x x" ..
|
|
)
|
|
'
|
|
|
|
test_expect_success 'grep from a subdirectory to search wider area (2)' '
|
|
mkdir -p s &&
|
|
(
|
|
cd s || exit 1
|
|
( git grep xxyyzz .. >out ; echo $? >status )
|
|
! test -s out &&
|
|
test 1 = $(cat status)
|
|
)
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
hello.c:int main(int argc, const char **argv)
|
|
EOF
|
|
|
|
test_expect_success 'grep -Fi' '
|
|
git grep -Fi "CHAR *" >actual &&
|
|
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 file1:hello &&
|
|
echo sub/file2:world
|
|
} >non/expect.full &&
|
|
echo file2:world >non/expect.sub &&
|
|
(
|
|
GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
|
|
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
|
|
) &&
|
|
|
|
echo ".*o*" >non/git/.gitignore &&
|
|
(
|
|
GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
|
|
export GIT_CEILING_DIRECTORIES &&
|
|
cd non/git &&
|
|
test_must_fail git grep o &&
|
|
git grep --no-index --exclude-standard o >../actual.full &&
|
|
test_cmp ../expect.full ../actual.full &&
|
|
|
|
{
|
|
echo ".gitignore:.*o*" &&
|
|
cat ../expect.full
|
|
} >../expect.with.ignored &&
|
|
git grep --no-index --no-exclude o >../actual.full &&
|
|
test_cmp ../expect.with.ignored ../actual.full
|
|
)
|
|
'
|
|
|
|
test_expect_success 'outside of git repository with fallbackToNoIndex' '
|
|
rm -fr non &&
|
|
mkdir -p non/git/sub &&
|
|
echo hello >non/git/file1 &&
|
|
echo world >non/git/sub/file2 &&
|
|
cat <<-\EOF >non/expect.full &&
|
|
file1:hello
|
|
sub/file2:world
|
|
EOF
|
|
echo file2:world >non/expect.sub &&
|
|
(
|
|
GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
|
|
export GIT_CEILING_DIRECTORIES &&
|
|
cd non/git &&
|
|
test_must_fail git -c grep.fallbackToNoIndex=false grep o &&
|
|
git -c grep.fallbackToNoIndex=true grep o >../actual.full &&
|
|
test_cmp ../expect.full ../actual.full &&
|
|
cd sub &&
|
|
test_must_fail git -c grep.fallbackToNoIndex=false grep o &&
|
|
git -c grep.fallbackToNoIndex=true grep o >../../actual.sub &&
|
|
test_cmp ../../expect.sub ../../actual.sub
|
|
) &&
|
|
|
|
echo ".*o*" >non/git/.gitignore &&
|
|
(
|
|
GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
|
|
export GIT_CEILING_DIRECTORIES &&
|
|
cd non/git &&
|
|
test_must_fail git -c grep.fallbackToNoIndex=false grep o &&
|
|
git -c grep.fallbackToNoIndex=true grep --exclude-standard o >../actual.full &&
|
|
test_cmp ../expect.full ../actual.full &&
|
|
|
|
{
|
|
echo ".gitignore:.*o*" &&
|
|
cat ../expect.full
|
|
} >../expect.with.ignored &&
|
|
git -c grep.fallbackToNoIndex grep --no-exclude o >../actual.full &&
|
|
test_cmp ../expect.with.ignored ../actual.full
|
|
)
|
|
'
|
|
|
|
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.unignored &&
|
|
{
|
|
echo ".gitignore:.*o*" &&
|
|
cat is/expect.unignored
|
|
} >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 --untracked o >../actual.unignored &&
|
|
test_cmp ../expect.unignored ../actual.unignored &&
|
|
|
|
git grep --no-index o >../actual.full &&
|
|
test_cmp ../expect.full ../actual.full &&
|
|
|
|
git grep --no-index --exclude-standard o >../actual.unignored &&
|
|
test_cmp ../expect.unignored ../actual.unignored &&
|
|
|
|
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 &&
|
|
|
|
git grep --untracked o >../../actual.sub &&
|
|
test_cmp ../../expect.sub ../../actual.sub
|
|
)
|
|
'
|
|
|
|
test_expect_success 'grep --no-index descends into repos, but not .git' '
|
|
rm -fr non &&
|
|
mkdir -p non/git &&
|
|
(
|
|
GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
|
|
export GIT_CEILING_DIRECTORIES &&
|
|
cd non/git &&
|
|
|
|
echo magic >file &&
|
|
git init repo &&
|
|
(
|
|
cd repo &&
|
|
echo magic >file &&
|
|
git add file &&
|
|
git commit -m foo &&
|
|
echo magic >.git/file
|
|
) &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
file
|
|
repo/file
|
|
EOF
|
|
git grep -l --no-index magic >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'setup double-dash tests' '
|
|
cat >double-dash <<EOF &&
|
|
--
|
|
->
|
|
other
|
|
EOF
|
|
git add double-dash
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
double-dash:->
|
|
EOF
|
|
test_expect_success 'grep -- pattern' '
|
|
git grep -- "->" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
test_expect_success 'grep -- pattern -- pathspec' '
|
|
git grep -- "->" -- double-dash >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
test_expect_success 'grep -e pattern -- path' '
|
|
git grep -e "->" -- double-dash >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
double-dash:--
|
|
EOF
|
|
test_expect_success 'grep -e -- -- path' '
|
|
git grep -e -- -- double-dash >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'dashdash disambiguates rev as rev' '
|
|
test_when_finished "rm -f master" &&
|
|
echo content >master &&
|
|
echo master:hello.c >expect &&
|
|
git grep -l o master -- hello.c >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'dashdash disambiguates pathspec as pathspec' '
|
|
test_when_finished "git rm -f master" &&
|
|
echo content >master &&
|
|
git add master &&
|
|
echo master:content >expect &&
|
|
git grep o -- master >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'report bogus arg without dashdash' '
|
|
test_must_fail git grep o does-not-exist
|
|
'
|
|
|
|
test_expect_success 'report bogus rev with dashdash' '
|
|
test_must_fail git grep o hello.c --
|
|
'
|
|
|
|
test_expect_success 'allow non-existent path with dashdash' '
|
|
# We need a real match so grep exits with success.
|
|
tree=$(git ls-tree HEAD |
|
|
sed s/hello.c/not-in-working-tree/ |
|
|
git mktree) &&
|
|
git grep o "$tree" -- not-in-working-tree
|
|
'
|
|
|
|
test_expect_success 'grep --no-index pattern -- path' '
|
|
rm -fr non &&
|
|
mkdir -p non/git &&
|
|
(
|
|
GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
|
|
export GIT_CEILING_DIRECTORIES &&
|
|
cd non/git &&
|
|
echo hello >hello &&
|
|
echo goodbye >goodbye &&
|
|
echo hello:hello >expect &&
|
|
git grep --no-index o -- hello >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'grep --no-index complains of revs' '
|
|
test_must_fail git grep --no-index o master -- 2>err &&
|
|
test_i18ngrep "cannot be used with revs" err
|
|
'
|
|
|
|
test_expect_success 'grep --no-index prefers paths to revs' '
|
|
test_when_finished "rm -f master" &&
|
|
echo content >master &&
|
|
echo master:content >expect &&
|
|
git grep --no-index o master >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep --no-index does not "diagnose" revs' '
|
|
test_must_fail git grep --no-index o :1:hello.c 2>err &&
|
|
test_i18ngrep ! -i "did you mean" err
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
hello.c:int main(int argc, const char **argv)
|
|
hello.c: printf("Hello world.\n");
|
|
EOF
|
|
|
|
test_expect_success PCRE 'grep --perl-regexp pattern' '
|
|
git grep --perl-regexp "\p{Ps}.*?\p{Pe}" hello.c >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success !PCRE 'grep --perl-regexp pattern errors without PCRE' '
|
|
test_must_fail git grep --perl-regexp "foo.*bar"
|
|
'
|
|
|
|
test_expect_success PCRE 'grep -P pattern' '
|
|
git grep -P "\p{Ps}.*?\p{Pe}" hello.c >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success LIBPCRE2 "grep -P with (*NO_JIT) doesn't error out" '
|
|
git grep -P "(*NO_JIT)\p{Ps}.*?\p{Pe}" hello.c >actual &&
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
test_expect_success !PCRE 'grep -P pattern errors without PCRE' '
|
|
test_must_fail git grep -P "foo.*bar"
|
|
'
|
|
|
|
test_expect_success 'grep pattern with grep.extendedRegexp=true' '
|
|
>empty &&
|
|
test_must_fail git -c grep.extendedregexp=true \
|
|
grep "\p{Ps}.*?\p{Pe}" hello.c >actual &&
|
|
test_cmp empty actual
|
|
'
|
|
|
|
test_expect_success PCRE 'grep -P pattern with grep.extendedRegexp=true' '
|
|
git -c grep.extendedregexp=true \
|
|
grep -P "\p{Ps}.*?\p{Pe}" hello.c >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success PCRE 'grep -P -v pattern' '
|
|
{
|
|
echo "ab:a+b*c"
|
|
echo "ab:a+bc"
|
|
} >expected &&
|
|
git grep -P -v "abc" ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success PCRE 'grep -P -i pattern' '
|
|
cat >expected <<-EOF &&
|
|
hello.c: printf("Hello world.\n");
|
|
EOF
|
|
git grep -P -i "PRINTF\([^\d]+\)" hello.c >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success PCRE 'grep -P -w pattern' '
|
|
{
|
|
echo "hello_world:Hello world"
|
|
echo "hello_world:HeLLo world"
|
|
} >expected &&
|
|
git grep -P -w "He((?i)ll)o" hello_world >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success PCRE 'grep -P backreferences work (the PCRE NO_AUTO_CAPTURE flag is not set)' '
|
|
git grep -P -h "(?P<one>.)(?P=one)" hello_world >actual &&
|
|
test_cmp hello_world actual &&
|
|
git grep -P -h "(.)\1" hello_world >actual &&
|
|
test_cmp hello_world actual
|
|
'
|
|
|
|
test_expect_success 'grep -G invalidpattern properly dies ' '
|
|
test_must_fail git grep -G "a["
|
|
'
|
|
|
|
test_expect_success 'grep invalidpattern properly dies with grep.patternType=basic' '
|
|
test_must_fail git -c grep.patterntype=basic grep "a["
|
|
'
|
|
|
|
test_expect_success 'grep -E invalidpattern properly dies ' '
|
|
test_must_fail git grep -E "a["
|
|
'
|
|
|
|
test_expect_success 'grep invalidpattern properly dies with grep.patternType=extended' '
|
|
test_must_fail git -c grep.patterntype=extended grep "a["
|
|
'
|
|
|
|
test_expect_success PCRE 'grep -P invalidpattern properly dies ' '
|
|
test_must_fail git grep -P "a["
|
|
'
|
|
|
|
test_expect_success PCRE 'grep invalidpattern properly dies with grep.patternType=perl' '
|
|
test_must_fail git -c grep.patterntype=perl grep "a["
|
|
'
|
|
|
|
test_expect_success 'grep -G -E -F pattern' '
|
|
echo "ab:a+b*c" >expected &&
|
|
git grep -G -E -F "a+b*c" ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep pattern with grep.patternType=basic, =extended, =fixed' '
|
|
echo "ab:a+b*c" >expected &&
|
|
git \
|
|
-c grep.patterntype=basic \
|
|
-c grep.patterntype=extended \
|
|
-c grep.patterntype=fixed \
|
|
grep "a+b*c" ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep -E -F -G pattern' '
|
|
echo "ab:a+bc" >expected &&
|
|
git grep -E -F -G "a+b*c" ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep pattern with grep.patternType=extended, =fixed, =basic' '
|
|
echo "ab:a+bc" >expected &&
|
|
git \
|
|
-c grep.patterntype=extended \
|
|
-c grep.patterntype=fixed \
|
|
-c grep.patterntype=basic \
|
|
grep "a+b*c" ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep -F -G -E pattern' '
|
|
echo "ab:abc" >expected &&
|
|
git grep -F -G -E "a+b*c" ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep pattern with grep.patternType=fixed, =basic, =extended' '
|
|
echo "ab:abc" >expected &&
|
|
git \
|
|
-c grep.patterntype=fixed \
|
|
-c grep.patterntype=basic \
|
|
-c grep.patterntype=extended \
|
|
grep "a+b*c" ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep -G -F -P -E pattern' '
|
|
echo "d0:d" >expected &&
|
|
git grep -G -F -P -E "[\d]" d0 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep pattern with grep.patternType=fixed, =basic, =perl, =extended' '
|
|
echo "d0:d" >expected &&
|
|
git \
|
|
-c grep.patterntype=fixed \
|
|
-c grep.patterntype=basic \
|
|
-c grep.patterntype=perl \
|
|
-c grep.patterntype=extended \
|
|
grep "[\d]" d0 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success PCRE 'grep -G -F -E -P pattern' '
|
|
echo "d0:0" >expected &&
|
|
git grep -G -F -E -P "[\d]" d0 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success PCRE 'grep pattern with grep.patternType=fixed, =basic, =extended, =perl' '
|
|
echo "d0:0" >expected &&
|
|
git \
|
|
-c grep.patterntype=fixed \
|
|
-c grep.patterntype=basic \
|
|
-c grep.patterntype=extended \
|
|
-c grep.patterntype=perl \
|
|
grep "[\d]" d0 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success PCRE 'grep -P pattern with grep.patternType=fixed' '
|
|
echo "ab:a+b*c" >expected &&
|
|
git \
|
|
-c grep.patterntype=fixed \
|
|
grep -P "a\x{2b}b\x{2a}c" ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep -F pattern with grep.patternType=basic' '
|
|
echo "ab:a+b*c" >expected &&
|
|
git \
|
|
-c grep.patterntype=basic \
|
|
grep -F "*c" ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep -G pattern with grep.patternType=fixed' '
|
|
{
|
|
echo "ab:a+b*c"
|
|
echo "ab:a+bc"
|
|
} >expected &&
|
|
git \
|
|
-c grep.patterntype=fixed \
|
|
grep -G "a+b" ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep -E pattern with grep.patternType=fixed' '
|
|
{
|
|
echo "ab:a+b*c"
|
|
echo "ab:a+bc"
|
|
echo "ab:abc"
|
|
} >expected &&
|
|
git \
|
|
-c grep.patterntype=fixed \
|
|
grep -E "a+" ab >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
hello.c<RED>:<RESET>int main(int argc, const char **argv)
|
|
hello.c<RED>-<RESET>{
|
|
<RED>--<RESET>
|
|
hello.c<RED>:<RESET> /* char ?? */
|
|
hello.c<RED>-<RESET>}
|
|
<RED>--<RESET>
|
|
hello_world<RED>:<RESET>Hello_world
|
|
hello_world<RED>-<RESET>HeLLo_world
|
|
EOF
|
|
|
|
test_expect_success 'grep --color, separator' '
|
|
test_config color.grep.context normal &&
|
|
test_config color.grep.filename normal &&
|
|
test_config color.grep.function normal &&
|
|
test_config color.grep.linenumber normal &&
|
|
test_config color.grep.match normal &&
|
|
test_config color.grep.selected normal &&
|
|
test_config color.grep.separator red &&
|
|
|
|
git grep --color=always -A1 -e char -e lo_w hello.c hello_world |
|
|
test_decode_color >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
hello.c:int main(int argc, const char **argv)
|
|
hello.c: /* char ?? */
|
|
|
|
hello_world:Hello_world
|
|
EOF
|
|
|
|
test_expect_success 'grep --break' '
|
|
git grep --break -e char -e lo_w hello.c hello_world >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
hello.c:int main(int argc, const char **argv)
|
|
hello.c-{
|
|
--
|
|
hello.c: /* char ?? */
|
|
hello.c-}
|
|
|
|
hello_world:Hello_world
|
|
hello_world-HeLLo_world
|
|
EOF
|
|
|
|
test_expect_success 'grep --break with context' '
|
|
git grep --break -A1 -e char -e lo_w hello.c hello_world >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
hello.c
|
|
int main(int argc, const char **argv)
|
|
/* char ?? */
|
|
hello_world
|
|
Hello_world
|
|
EOF
|
|
|
|
test_expect_success 'grep --heading' '
|
|
git grep --heading -e char -e lo_w hello.c hello_world >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
<BOLD;GREEN>hello.c<RESET>
|
|
4:int main(int argc, const <BLACK;BYELLOW>char<RESET> **argv)
|
|
8: /* <BLACK;BYELLOW>char<RESET> ?? */
|
|
|
|
<BOLD;GREEN>hello_world<RESET>
|
|
3:Hel<BLACK;BYELLOW>lo_w<RESET>orld
|
|
EOF
|
|
|
|
test_expect_success 'mimic ack-grep --group' '
|
|
test_config color.grep.context normal &&
|
|
test_config color.grep.filename "bold green" &&
|
|
test_config color.grep.function normal &&
|
|
test_config color.grep.linenumber normal &&
|
|
test_config color.grep.match "black yellow" &&
|
|
test_config color.grep.selected normal &&
|
|
test_config color.grep.separator normal &&
|
|
|
|
git grep --break --heading -n --color \
|
|
-e char -e lo_w hello.c hello_world |
|
|
test_decode_color >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
space: line with leading space1
|
|
space: line with leading space2
|
|
space: line with leading space3
|
|
EOF
|
|
|
|
test_expect_success PCRE 'grep -E "^ "' '
|
|
git grep -E "^ " space >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success PCRE 'grep -P "^ "' '
|
|
git grep -P "^ " space >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
space-line without leading space1
|
|
space: line <RED>with <RESET>leading space1
|
|
space: line <RED>with <RESET>leading <RED>space2<RESET>
|
|
space: line <RED>with <RESET>leading space3
|
|
space:line without leading <RED>space2<RESET>
|
|
EOF
|
|
|
|
test_expect_success 'grep --color -e A -e B with context' '
|
|
test_config color.grep.context normal &&
|
|
test_config color.grep.filename normal &&
|
|
test_config color.grep.function normal &&
|
|
test_config color.grep.linenumber normal &&
|
|
test_config color.grep.matchContext normal &&
|
|
test_config color.grep.matchSelected red &&
|
|
test_config color.grep.selected normal &&
|
|
test_config color.grep.separator normal &&
|
|
|
|
git grep --color=always -C2 -e "with " -e space2 space |
|
|
test_decode_color >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
space-line without leading space1
|
|
space- line with leading space1
|
|
space: line <RED>with <RESET>leading <RED>space2<RESET>
|
|
space- line with leading space3
|
|
space-line without leading space2
|
|
EOF
|
|
|
|
test_expect_success 'grep --color -e A --and -e B with context' '
|
|
test_config color.grep.context normal &&
|
|
test_config color.grep.filename normal &&
|
|
test_config color.grep.function normal &&
|
|
test_config color.grep.linenumber normal &&
|
|
test_config color.grep.matchContext normal &&
|
|
test_config color.grep.matchSelected red &&
|
|
test_config color.grep.selected normal &&
|
|
test_config color.grep.separator normal &&
|
|
|
|
git grep --color=always -C2 -e "with " --and -e space2 space |
|
|
test_decode_color >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
space-line without leading space1
|
|
space: line <RED>with <RESET>leading space1
|
|
space- line with leading space2
|
|
space: line <RED>with <RESET>leading space3
|
|
space-line without leading space2
|
|
EOF
|
|
|
|
test_expect_success 'grep --color -e A --and --not -e B with context' '
|
|
test_config color.grep.context normal &&
|
|
test_config color.grep.filename normal &&
|
|
test_config color.grep.function normal &&
|
|
test_config color.grep.linenumber normal &&
|
|
test_config color.grep.matchContext normal &&
|
|
test_config color.grep.matchSelected red &&
|
|
test_config color.grep.selected normal &&
|
|
test_config color.grep.separator normal &&
|
|
|
|
git grep --color=always -C2 -e "with " --and --not -e space2 space |
|
|
test_decode_color >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
hello.c-
|
|
hello.c=int main(int argc, const char **argv)
|
|
hello.c-{
|
|
hello.c: pr<RED>int<RESET>f("<RED>Hello<RESET> world.\n");
|
|
hello.c- return 0;
|
|
hello.c- /* char ?? */
|
|
hello.c-}
|
|
EOF
|
|
|
|
test_expect_success 'grep --color -e A --and -e B -p with context' '
|
|
test_config color.grep.context normal &&
|
|
test_config color.grep.filename normal &&
|
|
test_config color.grep.function normal &&
|
|
test_config color.grep.linenumber normal &&
|
|
test_config color.grep.matchContext normal &&
|
|
test_config color.grep.matchSelected red &&
|
|
test_config color.grep.selected normal &&
|
|
test_config color.grep.separator normal &&
|
|
|
|
git grep --color=always -p -C3 -e int --and -e Hello --no-index hello.c |
|
|
test_decode_color >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep can find things only in the work tree' '
|
|
: >work-tree-only &&
|
|
git add work-tree-only &&
|
|
test_when_finished "git rm -f 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
|
|
'
|
|
|
|
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 &&
|
|
test_when_finished "git rm -f 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
|
|
'
|
|
|
|
test_expect_success 'grep does not search work tree with assume unchanged' '
|
|
echo "intend to add this" >intend-to-add &&
|
|
git add -N intend-to-add &&
|
|
git update-index --assume-unchanged intend-to-add &&
|
|
test_when_finished "git rm -f intend-to-add" &&
|
|
test_must_fail 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
|
|
'
|
|
|
|
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_when_finished "git rm --cached 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
|
|
'
|
|
|
|
test_expect_success 'grep does not report i-t-a with -L --cached' '
|
|
echo "intend to add this" >intend-to-add &&
|
|
git add -N intend-to-add &&
|
|
test_when_finished "git rm -f intend-to-add" &&
|
|
git ls-files | grep -v "^intend-to-add\$" >expected &&
|
|
git grep -L --cached "nonexistent_string" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'grep does not report i-t-a and assume unchanged with -L' '
|
|
echo "intend to add this" >intend-to-add-assume-unchanged &&
|
|
git add -N intend-to-add-assume-unchanged &&
|
|
test_when_finished "git rm -f intend-to-add-assume-unchanged" &&
|
|
git update-index --assume-unchanged intend-to-add-assume-unchanged &&
|
|
git ls-files | grep -v "^intend-to-add-assume-unchanged\$" >expected &&
|
|
git grep -L "nonexistent_string" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|