Merge branch 'rs/plug-strbuf-leak-in-merge'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 79e8a33d043e7208c2c1a08ab38fad207049ef4c..9acdc8826fff1aabf9df5182a64109b7bd16cd8d 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -140,6 +140,9 @@ else
        }
 fi
 
+: ${ASAN_OPTIONS=detect_leaks=0}
+export ASAN_OPTIONS
+
 # Protect ourselves from common misconfiguration to export
 # CDPATH into the environment
 unset CDPATH