From: Junio C Hamano Date: Wed, 26 Oct 2016 20:14:48 +0000 (-0700) Subject: Merge branch 'jk/tighten-alloc' X-Git-Tag: v2.11.0-rc0~36 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d417fabaa0a8bcd8a9b39a88d870f07979e669e;p=git Merge branch 'jk/tighten-alloc' Protect our code from over-eager compilers. * jk/tighten-alloc: inline xalloc_flex() into FLEXPTR_ALLOC_MEM avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEM --- 4d417fabaa0a8bcd8a9b39a88d870f07979e669e