undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7810: do not abbreviate --no-exclude-standard nor --invert-match

Browse Source 
This script used abbreviated options, which is unnecessarily fragile.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2019-03-25 11:14:19 -07:00 committed by Junio C Hamano
parent f927ae6c86
commit 7076e4422c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
t/t7810-grep.sh
View File

@ -119,33 +119,33 @@ do
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "grep -w $L (with --column, --invert)" ' test_expect_success "grep -w $L (with --column, --invert-match)" '
{ {
echo ${HC}file:1:foo mmap bar echo ${HC}file:1:foo mmap bar
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
echo ${HC}file:1:foo mmap bar_mmap echo ${HC}file:1:foo mmap bar_mmap
} >expected && } >expected &&
git grep --column --invert -w -e baz $H -- file >actual && git grep --column --invert-match -w -e baz $H -- file >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "grep $L (with --column, --invert, extended OR)" ' test_expect_success "grep $L (with --column, --invert-match, extended OR)" '
{ {
echo ${HC}hello_world:6:HeLLo_world echo ${HC}hello_world:6:HeLLo_world
} >expected && } >expected &&
git grep --column --invert -e ll --or --not -e _ $H -- hello_world \ git grep --column --invert-match -e ll --or --not -e _ $H -- hello_world \
>actual && >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "grep $L (with --column, --invert, extended AND)" ' test_expect_success "grep $L (with --column, --invert-match, extended AND)" '
{ {
echo ${HC}hello_world:3:Hello world echo ${HC}hello_world:3:Hello world
echo ${HC}hello_world:3:Hello_world echo ${HC}hello_world:3:Hello_world
echo ${HC}hello_world:6:HeLLo_world echo ${HC}hello_world:6:HeLLo_world
} >expected && } >expected &&
git grep --column --invert --not -e _ --and --not -e ll $H -- hello_world \ git grep --column --invert-match --not -e _ --and --not -e ll $H -- hello_world \
>actual && >actual &&
test_cmp expected actual test_cmp expected actual
' '
@ -1010,7 +1010,7 @@ test_expect_success 'outside of git repository' '
echo ".gitignore:.*o*" && echo ".gitignore:.*o*" &&
cat ../expect.full cat ../expect.full
} >../expect.with.ignored && } >../expect.with.ignored &&
git grep --no-index --no-exclude o >../actual.full && git grep --no-index --no-exclude-standard o >../actual.full &&
test_cmp ../expect.with.ignored ../actual.full test_cmp ../expect.with.ignored ../actual.full
) )
' '
@ -1051,7 +1051,7 @@ test_expect_success 'outside of git repository with fallbackToNoIndex' '
echo ".gitignore:.*o*" && echo ".gitignore:.*o*" &&
cat ../expect.full cat ../expect.full
} >../expect.with.ignored && } >../expect.with.ignored &&
git -c grep.fallbackToNoIndex grep --no-exclude o >../actual.full && git -c grep.fallbackToNoIndex grep --no-exclude-standard o >../actual.full &&
test_cmp ../expect.with.ignored ../actual.full test_cmp ../expect.with.ignored ../actual.full
) )
' '