Merge branch 'jc/format-patch-range-diff-fix'

diff --git a/t/t1501-work-tree.sh b/t/t1501-work-tree.sh
index afcdfafe45521872b0e2f1648da782c61d0cc1d5..3498d3d55e9e18d19c9a9accaa1637f338c1c4bc 100755 (executable)
--- a/t/t1501-work-tree.sh
+++ b/t/t1501-work-tree.sh
@@ -41,7 +41,7 @@ test_expect_success 'setup: helper for testing rev-parse' '
                        # rev-parse --show-prefix should output
                        # a single newline when at the top of the work tree,
                        # but we test for that separately.
-                       test -z "$4" && ! test -s actual.prefix ||
+                       test -z "$4" && test_must_be_empty actual.prefix ||
                        test_cmp expected.prefix actual.prefix
                fi
        }