Skip to content

Commit

Permalink
Merge branch 'rj/maint-grep-remove-redundant-test' into maint
Browse files Browse the repository at this point in the history
* rj/maint-grep-remove-redundant-test:
  t7810-*.sh: Remove redundant test
  • Loading branch information
gitster committed Aug 15, 2012
2 parents 45b65a6 + 4ca9453 commit d7d3b56
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions t/t7810-grep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d7d3b56

Please sign in to comment.