From: Junio C Hamano Date: Wed, 25 Feb 2015 06:10:41 +0000 (-0800) Subject: Merge branch 'jc/apply-ws-fix-expands' into maint X-Git-Tag: v2.3.1~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2764442ac9a66532789526a6e6aaf0f1254a3548?ds=inline;hp=--cc Merge branch 'jc/apply-ws-fix-expands' into maint "git apply --whitespace=fix" used to under-allocate the memory when the fix resulted in a longer text than the original patch. * jc/apply-ws-fix-expands: apply: count the size of postimage correctly apply: make update_pre_post_images() sanity check the given postlen apply.c: typofix --- 2764442ac9a66532789526a6e6aaf0f1254a3548