summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-30 19:56:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-30 19:56:42 (GMT)
commit3e6d07174713ab4e1d66bb8324d0d73c96211b12 (patch)
tree0d2fc50f11e6f74bdfe842c60dd8ef296d237eaf
parent8de8bb805117f82bc027310c1157b65b2748596e (diff)
parent4ca945389f508b1c204db1eefc9be78d69bae929 (diff)
downloadgit-3e6d07174713ab4e1d66bb8324d0d73c96211b12.zip
git-3e6d07174713ab4e1d66bb8324d0d73c96211b12.tar.gz
git-3e6d07174713ab4e1d66bb8324d0d73c96211b12.tar.bz2
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
-rwxr-xr-xt/t7810-grep.sh11
1 files changed, 0 insertions, 11 deletions
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 24e9b19..523d041 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