Merge branch 'ma/ts-cleanups' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2017 05:19:02 +0000 (14:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2017 05:19:02 +0000 (14:19 +0900)
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
convert.c
strbuf.h
Simple merge
diff --cc convert.c
Simple merge
diff --cc strbuf.h
Simple merge