t7810: do not abbreviate `--no-exclude-standard` nor `--invert-match`
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>
Johannes Schindelin committed
Mar 25, 2019 at 11:14 UTC
7076e4422c0304a1c00f54e268e59dfd7c2ad510
1 file changed
+8
-8
t/t7810-grep.sh
+8
-8
@@ -119,33 +119,33 @@ do
119
test_cmp expected actual
120
'
121
122
- test_expect_success "grep -w $L (with --column, --invert)" '
122
+ test_expect_success "grep -w $L (with --column, --invert-match)" '
123
{
124
echo ${HC}file:1:foo mmap bar
125
echo ${HC}file:1:foo_mmap bar
126
echo ${HC}file:1:foo_mmap bar mmap
127
echo ${HC}file:1:foo mmap bar_mmap
128
} >expected &&
129
- git grep --column --invert -w -e baz $H -- file >actual &&
129
+ git grep --column --invert-match -w -e baz $H -- file >actual &&
130
test_cmp expected actual
131
'
132
133
- test_expect_success "grep $L (with --column, --invert, extended OR)" '
133
+ test_expect_success "grep $L (with --column, --invert-match, extended OR)" '
134
{
135
echo ${HC}hello_world:6:HeLLo_world
136
} >expected &&
137
- git grep --column --invert -e ll --or --not -e _ $H -- hello_world \
137
+ git grep --column --invert-match -e ll --or --not -e _ $H -- hello_world \
138
>actual &&
139
test_cmp expected actual
140
'
141
142
- test_expect_success "grep $L (with --column, --invert, extended AND)" '
142
+ test_expect_success "grep $L (with --column, --invert-match, extended AND)" '
143
{
144
echo ${HC}hello_world:3:Hello world
145
echo ${HC}hello_world:3:Hello_world
146
echo ${HC}hello_world:6:HeLLo_world
147
} >expected &&
148
- git grep --column --invert --not -e _ --and --not -e ll $H -- hello_world \
148
+ git grep --column --invert-match --not -e _ --and --not -e ll $H -- hello_world \
149
>actual &&
150
test_cmp expected actual
151
'
@@ -1010,7 +1010,7 @@ test_expect_success 'outside of git repository' '
1010
echo ".gitignore:.*o*" &&
1011
cat ../expect.full
1012
} >../expect.with.ignored &&
1013
- git grep --no-index --no-exclude o >../actual.full &&
1013
+ git grep --no-index --no-exclude-standard o >../actual.full &&
1014
test_cmp ../expect.with.ignored ../actual.full
1015
)
1016
'
@@ -1051,7 +1051,7 @@ test_expect_success 'outside of git repository with fallbackToNoIndex' '
1051
echo ".gitignore:.*o*" &&
1052
cat ../expect.full
1053
} >../expect.with.ignored &&
1054
- git -c grep.fallbackToNoIndex grep --no-exclude o >../actual.full &&
1054
+ git -c grep.fallbackToNoIndex grep --no-exclude-standard o >../actual.full &&
1055
test_cmp ../expect.with.ignored ../actual.full
1056
)
1057
'