Re: git am crash (builtin/apply.c:2108) + small repro

2012-11-14 Thread Junio C Hamano
Alexey Spiridonov snarkmas...@gmail.com writes: Thanks for looking into this, guys! I seem to run into this with some regularity, but my setting is apply.whitespace=strip rather than 'fix'. 'strip' is an old synonym for 'fix'. -- To unsubscribe from this list: send the line unsubscribe git

Re: git am crash (builtin/apply.c:2108) + small repro

2012-11-05 Thread Alexey Spiridonov
Thanks for looking into this, guys! I seem to run into this with some regularity, but my setting is apply.whitespace=strip rather than 'fix'. Is there an obvious workaround? Here are my remaining settings, sanitized for file paths and URLs: svn.rmdir=true push.default=upstream color.ui=auto

Re: git am crash (builtin/apply.c:2108) + small repro

2012-10-12 Thread Junio C Hamano
Nguyen Thai Ngoc Duy pclo...@gmail.com writes: On Wed, Oct 3, 2012 at 10:44 PM, Alexey Spiridonov snarkmas...@gmail.com wrote: Thanks a lot for trying this. My hashes match. I just re-reproduced it on two flavors of Linux (64 and 32-bit), with two different Git versions (see below). What

Re: git am crash (builtin/apply.c:2108) + small repro

2012-10-06 Thread Nguyen Thai Ngoc Duy
On Wed, Oct 3, 2012 at 10:44 PM, Alexey Spiridonov snarkmas...@gmail.com wrote: Thanks a lot for trying this. My hashes match. I just re-reproduced it on two flavors of Linux (64 and 32-bit), with two different Git versions (see below). What platform are you using? x86, 32 bit. Perhaps it

git am crash (builtin/apply.c:2108) + small repro

2012-10-01 Thread Alexey Spiridonov
This reproduces in trunk, 1.7.8.4, and 1.7.9.5. I suspect this has to do with a whitespace + no trailing newline issues. The patch was generated by 1.7.9.5. I mangled it by hand to get it to be small, but the initial crash happened on a large, real-world output of git format-patch. Error