{"thread":{"id":"20599","subject":"Re: trailling whitespace with git am ?","startedAt":"2009-08-14T21:43:02Z","lastAt":"2009-08-14T21:50:18Z","messageCount":2,"participants":["Alex Riesen","PICCA Frédéric-Emmanuel"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"120667","messageId":"81b0412b0908141443vc54c009o9ec39b3f617311dd@mail.gmail.com","threadId":"20599","inReplyTo":null,"subject":"Re: trailling whitespace with git am ?","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2009-08-14T21:43:02Z","receivedAt":"2009-08-14T21:43:02Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On Fri, Aug 14, 2009 at 22:50, PICCA\nFrédéric-Emmanuel<frederic-emmanuel.picca@synchrotron-soleil.fr>\nwrote:\n>> > git am --whitespace=fix was sufficient to apply the patch\n>\n>> Depending on your situation it can be an overkill: it'll remove _all_ trailing\n>> white space. Not just \\r (CR).\n>\n> so /s /t and /r are the same things for git ?\n>\n\nalmost. For git-apply's whitespace fixing code. Why?\n"},{"id":"120668","messageId":"606CC410B038E34CB97646A32D0EC0BF0181FAC3@venusbis.synchrotron-soleil.fr","threadId":"20599","inReplyTo":"81b0412b0908141443vc54c009o9ec39b3f617311dd@mail.gmail.com","subject":"RE : trailling whitespace with git am ?","fromName":"PICCA Frédéric-Emmanuel","fromEmail":"frederic-emmanuel.picca@synchrotron-soleil.fr","sentAt":"2009-08-14T21:50:18Z","receivedAt":"2009-08-14T21:50:18Z","isPatch":false,"sender":{"key":"frederic-emmanuel.picca@synchrotron-soleil.fr","avatar":null},"body":"> > so /s /t and /r are the same things for git ?\n\n> almost. For git-apply's whitespace fixing code. Why?\n\nBecause for the user the message trailling whitespace was not clear\nIn fact the problem was a dos/unix format not a trailling space.\n\nbut whitespace=fix solve this problem. I was surprise first because I was looking for\nremaining space at the end of lines of the patch not this CR+LF things.\n\nMaybe git apply should warn the user a different way if their is that sort of dos/unix imcompatibilities.\n\nthanks\n\nFrederic\n"}]}