From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Feb 2015 18:15:20 +0000 (-0800)
Subject: Merge branch 'jc/apply-ws-fix-expands'
X-Git-Tag: v2.4.0-rc0~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38459ee6afa0ce8aef81f5022aa9bd9260e0fdd7;p=git

Merge branch 'jc/apply-ws-fix-expands'

"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
---

38459ee6afa0ce8aef81f5022aa9bd9260e0fdd7