Merge branch 'xf/user-manual-ff' into maint

diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index 8aae98d482aa572b3a9a55f9b38280ad716c7baf..7b5b6d452e3762c9d0e311602bf39317200c21a7 100755 (executable)
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -169,7 +169,7 @@ test_expect_success 'create packed foo/bar/baz branch' '
        git branch foo/bar/baz &&
        git pack-refs --all --prune &&
        test_path_is_missing .git/refs/heads/foo/bar/baz &&
-       test_path_is_missing .git/logs/refs/heads/foo/bar/baz
+       test_must_fail git reflog exists refs/heads/foo/bar/baz
 '
 
 test_expect_success 'notice d/f conflict with existing directory' '