Merge branch 'jk/remote-literal-string-leakfix'

diff --git a/t/t7008-grep-binary.sh b/t/t7008-grep-binary.sh
index a91260a02a4825a3228884b14eeeaee332efa39f..b146406e9c0912cdeb1a9c5bc93d41b981e971ca 100755 (executable)
--- 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