Merge branch 'jn/fast-import-fix'

diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index dc5c08548bb9e0ad7d42d9a6bc88e0756badf457..c8777589ca1c89825b570cfc05405a39df39aaba 100755 (executable)
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -65,7 +65,7 @@ do
 
        test_expect_success "grep -w $L (w)" '
                : >expected &&
-               ! git grep -n -w -e "^w" >actual &&
+               test_must_fail git grep -n -w -e "^w" >actual &&
                test_cmp expected actual
        '
 
@@ -479,7 +479,7 @@ test_expect_success 'outside of git repository' '
                echo file1:hello &&
                echo sub/file2:world
        } >non/expect.full &&
-       echo file2:world >non/expect.sub
+       echo file2:world >non/expect.sub &&
        (
                GIT_CEILING_DIRECTORIES="$(pwd)/non/git" &&
                export GIT_CEILING_DIRECTORIES &&
@@ -505,7 +505,7 @@ test_expect_success 'inside git repository but with --no-index' '
                echo sub/file2:world
        } >is/expect.full &&
        : >is/expect.empty &&
-       echo file2:world >is/expect.sub
+       echo file2:world >is/expect.sub &&
        (
                cd is/git &&
                git init &&