Merge branch 'ag/p3400-force-checkout'

diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh
index 4d62ceef9c15cc981bada757bcf7cfa43f2dd9a5..985daf1def366fd1aa928bd2ddeeca454c4702ca 100755 (executable)
--- a/t/t1411-reflog-show.sh
+++ b/t/t1411-reflog-show.sh
@@ -136,13 +136,12 @@ test_expect_success '--date magic does not override explicit @{0} syntax' '
        test_cmp expect actual
 '
 
-: >expect
 test_expect_success 'empty reflog file' '
        git branch empty &&
        git reflog expire --expire=all refs/heads/empty &&
 
        git log -g empty >actual &&
-       test_cmp expect actual
+       test_must_be_empty actual
 '
 
 # This guards against the alternative of showing the diffs vs. the