Merge branch 'ds/reachable'

diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 8293131001ee0e816406df858dc47bc2fb9be3ce..388b0611d8e4590f36d9aa44f11d4945a2ae7408 100755 (executable)
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -290,9 +290,8 @@ test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
        # same as before, but we only create a reflog for "one" if
        # it already exists, which it does not
        git -c core.logallrefupdates=false branch one master &&
-       : >expect &&
        git log -g --format="%gd %gs" one >actual &&
-       test_cmp expect actual
+       test_must_be_empty actual
 '
 
 # Triggering the bug detected by this test requires a newline to fall