Merge branch 'sg/fsck-config-in-doc'

diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh
index 972bd9c7859f52ac043b0a45500590fe182d4b6a..9974457f5615c9c9204ebfaff6d42c621836fdec 100755 (executable)
--- a/t/t1510-repo-setup.sh
+++ b/t/t1510-repo-setup.sh
@@ -234,14 +234,14 @@ test_expect_success '#0: nonbare repo, no explicit configuration' '
        try_repo 0 unset unset unset "" unset \
                .git "$here/0" "$here/0" "(null)" \
                .git "$here/0" "$here/0" sub/ 2>message &&
-       ! test -s message
+       test_must_be_empty message
 '
 
 test_expect_success '#1: GIT_WORK_TREE without explicit GIT_DIR is accepted' '
        try_repo 1 "$here" unset unset "" unset \
                "$here/1/.git" "$here" "$here" 1/ \
                "$here/1/.git" "$here" "$here" 1/sub/ 2>message &&
-       ! test -s message
+       test_must_be_empty message
 '
 
 test_expect_success '#2: worktree defaults to cwd with explicit GIT_DIR' '
@@ -268,7 +268,7 @@ test_expect_success '#4: core.worktree without GIT_DIR set is accepted' '
        try_case 4 unset unset \
                .git "$here/4/sub" "$here/4" "(null)" \
                "$here/4/.git" "$here/4/sub" "$here/4/sub" "(null)" 2>message &&
-       ! test -s message
+       test_must_be_empty message
 '
 
 test_expect_success '#5: core.worktree + GIT_WORK_TREE is accepted' '
@@ -279,7 +279,7 @@ test_expect_success '#5: core.worktree + GIT_WORK_TREE is accepted' '
        try_repo 5a .. unset "$here/5a" "" unset \
                "$here/5a/.git" "$here" "$here" 5a/ \
                "$here/5a/.git" "$here/5a" "$here/5a" sub/ &&
-       ! test -s message
+       test_must_be_empty message
 '
 
 test_expect_success '#6: setting GIT_DIR brings core.worktree to life' '
@@ -376,7 +376,7 @@ test_expect_success '#9: GIT_WORK_TREE accepted with gitfile' '
        try_repo 9 wt unset unset gitfile unset \
                "$here/9.git" "$here/9/wt" "$here/9" "(null)" \
                "$here/9.git" "$here/9/sub/wt" "$here/9/sub" "(null)" 2>message &&
-       ! test -s message
+       test_must_be_empty message
 '
 
 test_expect_success '#10: GIT_DIR can point to gitfile' '
@@ -402,7 +402,7 @@ test_expect_success '#12: core.worktree with gitfile is accepted' '
        try_repo 12 unset unset "$here/12" gitfile unset \
                "$here/12.git" "$here/12" "$here/12" "(null)" \
                "$here/12.git" "$here/12" "$here/12" sub/ 2>message &&
-       ! test -s message
+       test_must_be_empty message
 '
 
 test_expect_success '#13: core.worktree+GIT_WORK_TREE accepted (with gitfile)' '
@@ -410,7 +410,7 @@ test_expect_success '#13: core.worktree+GIT_WORK_TREE accepted (with gitfile)' '
        try_repo 13 non-existent-too unset non-existent gitfile unset \
                "$here/13.git" "$here/13/non-existent-too" "$here/13" "(null)" \
                "$here/13.git" "$here/13/sub/non-existent-too" "$here/13/sub" "(null)" 2>message &&
-       ! test -s message
+       test_must_be_empty message
 '
 
 # case #14.
@@ -565,7 +565,7 @@ test_expect_success '#17: GIT_WORK_TREE without explicit GIT_DIR is accepted (ba
        try_repo 17c "$here/17c" unset unset "" true \
                .git "$here/17c" "$here/17c" "(null)" \
                "$here/17c/.git" "$here/17c" "$here/17c" sub/ 2>message &&
-       ! test -s message
+       test_must_be_empty message
 '
 
 test_expect_success '#18: bare .git named by GIT_DIR has no worktree' '
@@ -594,7 +594,7 @@ test_expect_success '#20a: core.worktree without GIT_DIR accepted (inside .git)'
                "$here/20a/.git" "$here/20a" "$here/20a" .git/wt/ &&
        try_case 20a/.git/wt/sub unset unset \
                "$here/20a/.git" "$here/20a" "$here/20a" .git/wt/sub/ &&
-       ! test -s message
+       test_must_be_empty message
 '
 
 test_expect_success '#20b/c: core.worktree and core.bare conflict' '
@@ -626,7 +626,7 @@ test_expect_success '#21: setup, core.worktree warns before overriding core.bare
                export GIT_WORK_TREE &&
                git status >/dev/null
        ) 2>message &&
-       ! test -s message
+       test_must_be_empty message
 
 '
 run_wt_tests 21
@@ -742,7 +742,7 @@ test_expect_success '#25: GIT_WORK_TREE accepted if GIT_DIR unset (bare gitfile
        try_repo 25 "$here/25" unset unset gitfile true \
                "$here/25.git" "$here/25" "$here/25" "(null)"  \
                "$here/25.git" "$here/25" "$here/25" "sub/" 2>message &&
-       ! test -s message
+       test_must_be_empty message
 '
 
 test_expect_success '#26: bare repo has no worktree (GIT_DIR -> gitfile case)' '
@@ -780,7 +780,7 @@ test_expect_success '#29: setup' '
                export GIT_WORK_TREE &&
                git status
        ) 2>message &&
-       ! test -s message
+       test_must_be_empty message
 '
 run_wt_tests 29 gitfile