Merge branch 'nd/status-refresh-progress'

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 391f910c6a9fceff7a03e523076399f2db1cc0f0..4d23373526945eea7bc4e875beac5fdc4451cac8 100755 (executable)
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -87,6 +87,10 @@ _run_sub_test_lib_test_common () {
                passing metrics
                '
 
+               # Tell the framework that we are self-testing to make sure
+               # it yields a stable result.
+               GIT_TEST_FRAMEWORK_SELFTEST=t &&
+
                # Point to the t/test-lib.sh, which isn't in ../ as usual
                . "\$TEST_DIRECTORY"/test-lib.sh
                EOF
@@ -1097,7 +1101,7 @@ test_expect_success 'validate git diff-files output for a know cache/work tree s
 :120000 120000 $(test_oid subp3s) $ZERO_OID M  path3/subp3/file3sym
 EOF
        git diff-files >current &&
-       test_cmp current expected
+       test_cmp expected current
 '
 
 test_expect_success 'git update-index --refresh should succeed' '