]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ma/ts-cleanups'
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:08:22 +0000 (17:08 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:08:22 +0000 (17:08 +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
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