diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-12 19:06:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-13 01:04:54 -0800 |
| commit | bbc09c22b9f7784b1aab71d4876227956e6e8f4f (patch) | |
| tree | a3595de4913b9561f91b14b7e6156b706dbc87ab /t | |
| parent | Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc/maint-grep-lookahead (diff) | |
| download | tgif-bbc09c22b9f7784b1aab71d4876227956e6e8f4f.tar.xz | |
grep: rip out support for external grep
We still allow people to pass --[no-]ext-grep on the command line,
but the option is ignored.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7002-grep.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh index abd14bf819..c369cdbe9b 100755 --- a/t/t7002-grep.sh +++ b/t/t7002-grep.sh @@ -302,8 +302,8 @@ test_expect_success 'grep -C1, hunk mark between files' ' test_cmp expected actual ' -test_expect_success 'grep -C1 --no-ext-grep, hunk mark between files' ' - git grep -C1 --no-ext-grep "^[yz]" >actual && +test_expect_success 'grep -C1 hunk mark between files' ' + git grep -C1 "^[yz]" >actual && test_cmp expected actual ' @@ -359,7 +359,7 @@ test_expect_success 'log grep (6)' ' test_expect_success 'grep with CE_VALID file' ' git update-index --assume-unchanged t/t && rm t/t && - test "$(git grep --no-ext-grep test)" = "t/t:test" && + test "$(git grep test)" = "t/t:test" && git update-index --no-assume-unchanged t/t && git checkout t/t ' |