mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grep: allow to use textconv filters

Browse Source 
Recently and not so recently, we made sure that log/grep type operations
use textconv filters when a userfacing diff would do the same:

ef90ab6 (pickaxe: use textconv for -S counting, 2012-10-28)
b1c2f57 (diff_grep: use textconv buffers for add/deleted files, 2012-10-28)
0508fe5 (combine-diff: respect textconv attributes, 2011-05-23)

"git grep" currently does not use textconv filters at all, that is
neither for displaying the match and context nor for the actual grepping,
even when requested by --textconv.

Introduce an option "--textconv" which makes git grep use any configured
textconv filters for grepping and output purposes. It is off by default.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2013-05-10 17:10:15 +02:00
committed by Junio C Hamano
parent 97f6a9c975
commit 335ec3bf41
5 changed files with 102 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/t7008-grep-binary.sh
View File

@ -160,7 +160,7 @@ test_expect_success 'grep does not honor textconv' '
test_must_fail git grep Qfile
'
test_expect_failure 'grep --textconv honors textconv' '
test_expect_success 'grep --textconv honors textconv' '
echo "a:binaryQfile" >expect &&
git grep --textconv Qfile >actual &&
test_cmp expect actual
@ -176,4 +176,8 @@ test_expect_failure 'grep --textconv blob honors textconv' '
test_cmp expect actual
'
test_expect_success 'grep --no-textconv blob does not honor textconv' '
test_must_fail git grep --no-textconv Qfile HEAD:a
'
test_done