Merge branch 'ma/ts-cleanups' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Aug 2017 21:41:11 +0000 (14:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Aug 2017 21:41:11 +0000 (14:41 -0700)
Assorted bugfixes and clean-ups.

* ma/ts-cleanups:
ThreadSanitizer: add suppressions
strbuf_setlen: don't write to strbuf_slopbuf
pack-objects: take lock before accessing `remaining`
convert: always initialize attr_action in convert_attrs

1  2 
builtin/pack-objects.c
color.c
convert.c
strbuf.h
transport-helper.c
Simple merge
diff --cc color.c
Simple merge
diff --cc convert.c
Simple merge
diff --cc strbuf.h
Simple merge
Simple merge