aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2012-07-28 19:50:49 +0100
committerJunio C Hamano <gitster@pobox.com>2012-07-29 18:08:50 -0700
commit4ca945389f508b1c204db1eefc9be78d69bae929 (patch)
tree46d0f0f1ed76cd6a16cbf3d326c6f93b949a8794
parentd0f1ea6003d97e63110fa7d50bb07f546a909b6e (diff)
downloadgit-4ca945389f508b1c204db1eefc9be78d69bae929.tar.gz
git-4ca945389f508b1c204db1eefc9be78d69bae929.tar.xz
t7810-*.sh: Remove redundant test
Since commit bbc09c22 ("grep: rip out support for external grep", 12-01-2010), test number 60 ("grep -C1 hunk mark between files") is essentially the same as test number 59. Test 59 was intended to verify the behaviour of git-grep resulting from multiple invocations of an external grep. As part of the test, it creates and adds 1024 files to the index, which is now wasted effort. Remove test 59, since it is now redundant. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-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 75f4716d8..cd32ac5eb 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -387,17 +387,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