commit | 2764442ac9a66532789526a6e6aaf0f1254a3548 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Tue Feb 24 22:10:41 2015 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Tue Feb 24 22:10:41 2015 -0800 |
tree | bc8a44f1ecd73efd97ca456ae58df917b1457597 | |
parent | 254a3ebfe8d6061721629d9cba9b3d5f4f591ba6 [diff] | |
parent | 407a792ef7e3c142a47c6b09a80f9ede4e14f444 [diff] |
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