Sixth batch for 2.6

diff --git a/t/t5312-prune-corruption.sh b/t/t5312-prune-corruption.sh
index 8e98b44083f76b959f32883059f07d65a5b8aadb..da9d59940d5aa72a059a36f4187775b093eb5a58 100755 (executable)
--- a/t/t5312-prune-corruption.sh
+++ b/t/t5312-prune-corruption.sh
@@ -12,7 +12,7 @@ delete objects that cannot be recovered.
 
 test_expect_success 'disable reflogs' '
        git config core.logallrefupdates false &&
-       rm -rf .git/logs
+       git reflog expire --expire=all --all
 '
 
 test_expect_success 'create history reachable only from a bogus-named ref' '