Merge branch 'dt/log-follow-config'

diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh
index 3eb4f102e505445041a3772404523a99245a8346..6ac7734d79be21a82feeadff10064bb4ca7ad47b 100755 (executable)
--- a/t/t1411-reflog-show.sh
+++ b/t/t1411-reflog-show.sh
@@ -138,7 +138,7 @@ test_expect_success '--date magic does not override explicit @{0} syntax' '
 : >expect
 test_expect_success 'empty reflog file' '
        git branch empty &&
-       : >.git/logs/refs/heads/empty &&
+       git reflog expire --expire=all refs/heads/empty &&
 
        git log -g empty >actual &&
        test_cmp expect actual