diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-08-15 13:37:20 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-08-15 13:37:20 -0700 |
commit | d7d3b56bb15256af63a61c6f00e367eba36a647a (patch) | |
tree | 4bc5363a3f8a821e84a6239ddcd9688711803430 | |
parent | 45b65a6b676639e62bae1367f3902bfc470e5661 (diff) | |
parent | 4ca945389f508b1c204db1eefc9be78d69bae929 (diff) | |
download | git-d7d3b56bb15256af63a61c6f00e367eba36a647a.tar.gz git-d7d3b56bb15256af63a61c6f00e367eba36a647a.tar.xz |
Merge branch 'rj/maint-grep-remove-redundant-test' into maint
* rj/maint-grep-remove-redundant-test:
t7810-*.sh: Remove redundant test
-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 24e9b1974..523d04123 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 |