Merge branch 'cb/fsmonitor-intfix' into maint

diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh
index bb91dbb173dd01bfbfc11f867f0fcfc355db6822..6a3a42531b056285ac3a42cabe97c41146fa4291 100755 (executable)
--- a/t/perf/p5310-pack-bitmaps.sh
+++ b/t/perf/p5310-pack-bitmaps.sh
@@ -12,8 +12,7 @@ test_perf_large_repo
 # We intentionally use the deprecated pack.writebitmaps
 # config so that we can test against older versions of git.
 test_expect_success 'setup bitmap config' '
-       git config pack.writebitmaps true &&
-       git config pack.writebitmaphashcache true
+       git config pack.writebitmaps true
 '
 
 test_perf 'repack to disk' '