aboutsummaryrefslogtreecommitdiff
path: root/t/t7008-grep-binary.sh
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2013-05-10 17:10:16 +0200
committerJunio C Hamano <gitster@pobox.com>2013-05-10 10:27:34 -0700
commitafa15f3cd8f4cbf9572138329be374ff8566b10a (patch)
treeba8751467e428e397ec3e24ee648c3e1a4a520b5 /t/t7008-grep-binary.sh
parent335ec3bf411ae6606b58885deb281192c86651c6 (diff)
downloadgit-afa15f3cd8f4cbf9572138329be374ff8566b10a.tar.gz
git-afa15f3cd8f4cbf9572138329be374ff8566b10a.tar.xz
grep: honor --textconv for the case rev:path
Make "grep" honor the "--textconv" option also for the object case, i.e. when used with an argument "rev:path". Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7008-grep-binary.sh')
-rwxr-xr-xt/t7008-grep-binary.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/t/t7008-grep-binary.sh b/t/t7008-grep-binary.sh
index a91260a02..b146406e9 100755
--- a/t/t7008-grep-binary.sh
+++ b/t/t7008-grep-binary.sh
@@ -170,14 +170,10 @@ test_expect_success 'grep --no-textconv does not honor textconv' '
test_must_fail git grep --no-textconv Qfile
'
-test_expect_failure 'grep --textconv blob honors textconv' '
+test_expect_success 'grep --textconv blob honors textconv' '
echo "HEAD:a:binaryQfile" >expect &&
git grep --textconv Qfile HEAD:a >actual &&
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