From: Alex Riesen <raa.lkml@gmail.com>
Date: Fri, 14 Aug 2009 20:10:09 GMT
Subject: Re: trailling whitespace with git am ?
Message-ID: <81b0412b0908141310x7e4acf4fgf4ea71cf53de6eea@mail.gmail.com>
In-Reply-To: <606CC410B038E34CB97646A32D0EC0BF0181FAB4@venusbis.synchrotron-soleil.fr>

2009/8/14 PICCA Frédéric-Emmanuel
<frederic-emmanuel.picca@synchrotron-soleil.fr>:
> mordor% git am /home/picca/Projets/patches/0001-Add-the-POGO-TO-DELETE-comment-to-ComputedAnglesClea.patch
> Applying: 'Add the POGO TO DELETE comment to ComputedAnglesClear command'
> /tmp/diffractometer/.git/rebase-apply/patch:13: trailing whitespace.
>
> /tmp/diffractometer/.git/rebase-apply/patch:14: trailing whitespace.
>        /* POGO TO DELETE */
> error: patch failed: src/Diffractometer/Diffractometer.cpp:2023
> error: src/Diffractometer/Diffractometer.cpp: patch does not apply

This patch has DOS line endings (like CR, followed by LF).

You can either use dos2unix (or your editor of choice), or update your git
to current master branch, where "git am" handles such patches transparently.