Merge branch 'sb/object-store-lookup'

diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 9312c8daf523abd3da1681e8777648c71401e2ae..90bba4fcefd5f32d9200188cef77913b5d5fd40f 100755 (executable)
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -940,10 +940,9 @@ test_expect_success 'grep from a subdirectory to search wider area (1)' '
 test_expect_success 'grep from a subdirectory to search wider area (2)' '
        mkdir -p s &&
        (
-               cd s || exit 1
-               ( git grep xxyyzz .. >out ; echo $? >status )
-               ! test -s out &&
-               test 1 = $(cat status)
+               cd s &&
+               test_expect_code 1 git grep xxyyzz .. >out &&
+               ! test -s out
        )
 '