Merge "checkout ambiguous ref bugfix" into maint

diff --git a/t/valgrind/default.supp b/t/valgrind/default.supp
index 2482b3b06a7d49e9bc01545395df8095189d053a..0a6724fcc45eed89d612b0e641fd3fe6d4231fcb 100644 (file)
--- a/t/valgrind/default.supp
+++ b/t/valgrind/default.supp
@@ -4,6 +4,12 @@
        obj:*libz.so*
 }
 
+{
+       ignore-zlib-errors-value8
+       Memcheck:Value8
+       obj:*libz.so*
+}
+
 {
        ignore-zlib-errors-value4
        Memcheck:Value4
@@ -11,7 +17,25 @@
 }
 
 {
-       writing-data-from-zlib-triggers-errors
+       ignore-ldso-cond
+       Memcheck:Cond
+       obj:*ld-*.so
+}
+
+{
+       ignore-ldso-addr8
+       Memcheck:Addr8
+       obj:*ld-*.so
+}
+
+{
+       ignore-ldso-addr4
+       Memcheck:Addr4
+       obj:*ld-*.so
+}
+
+{
+       writing-data-from-zlib-triggers-even-more-errors
        Memcheck:Param
        write(buf)
        obj:/lib/ld-*.so
@@ -19,3 +43,9 @@
        fun:write_buffer
        fun:write_loose_object
 }
+
+{
+       ignore-sse-strlen-invalid-read-size
+       Memcheck:Addr4
+       fun:copy_ref
+}