diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-30 12:56:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-30 12:56:42 -0700 |
| commit | 3e6d07174713ab4e1d66bb8324d0d73c96211b12 (patch) | |
| tree | 0d2fc50f11e6f74bdfe842c60dd8ef296d237eaf /t/t7810-grep.sh | |
| parent | Merge branch 'dg/submodule-in-dismembered-working-tree' (diff) | |
| parent | t7810-*.sh: Remove redundant test (diff) | |
| download | tgif-3e6d07174713ab4e1d66bb8324d0d73c96211b12.tar.xz | |
Merge branch 'rj/maint-grep-remove-redundant-test'
"git grep" stopped spawning an external "grep" long time ago, but a
duplicated test to check internal and external "grep" was left
behind.
* rj/maint-grep-remove-redundant-test:
t7810-*.sh: Remove redundant test
Diffstat (limited to 't/t7810-grep.sh')
| -rwxr-xr-x | t/t7810-grep.sh | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 24e9b1974d..523d04123d 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -399,17 +399,6 @@ test_expect_success 'grep -q, silently report matches' ' test_cmp empty actual ' -# Create 1024 file names that sort between "y" and "z" to make sure -# the two files are handled by different calls to an external grep. -# This depends on MAXARGS in builtin-grep.c being 1024 or less. -c32="0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v" -test_expect_success 'grep -C1, hunk mark between files' ' - for a in $c32; do for b in $c32; do : >y-$a$b; done; done && - git add y-?? && - git grep -C1 "^[yz]" >actual && - test_cmp expected actual -' - test_expect_success 'grep -C1 hunk mark between files' ' git grep -C1 "^[yz]" >actual && test_cmp expected actual |