Merge branch 'sb/submodule-path-misc-bugs' into maint

diff --git a/t/t7008-grep-binary.sh b/t/t7008-grep-binary.sh
index b146406e9c0912cdeb1a9c5bc93d41b981e971ca..9c9c378119defa7884a21beb27e806ddf1171497 100755 (executable)
--- a/t/t7008-grep-binary.sh
+++ b/t/t7008-grep-binary.sh
@@ -141,7 +141,8 @@ test_expect_success 'grep respects not-binary diff attribute' '
        test_cmp expect actual &&
        echo "b diff" >.gitattributes &&
        echo "b:binQary" >expect &&
-       git grep bin b | nul_to_q >actual &&
+       git grep bin b >actual.raw &&
+       nul_to_q <actual.raw >actual &&
        test_cmp expect actual
 '