git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c1fa3e2 407a792)
Merge branch 'jc/apply-ws-fix-expands'
authorJunio C Hamano <redacted>
Tue, 17 Feb 2015 18:15:20 +0000 (10:15 -0800)
committerJunio C Hamano <redacted>
Tue, 17 Feb 2015 18:15:21 +0000 (10:15 -0800)
commit38459ee6afa0ce8aef81f5022aa9bd9260e0fdd7
treeec502044a9e8a41fcfee5363ae422b362a22f9d3tree | snapshot
parentc1fa3e21bc3223a7b18616a374cecff70721d157commit | diff
parent407a792ef7e3c142a47c6b09a80f9ede4e14f444commit | diff
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
builtin/apply.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT