Re: RE : trailling whitespace with git am ?

On Fri, Aug 14, 2009 at 22:21, PICCA
Frédéric-Emmanuel[off-list ref]
wrote:

quoted

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

quoted

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.

I am using git 1.6.3.3 debian unstable is it ok ?

No. I just checked - it is not even in master yet. You can merge
the commits at c2ca1d79dbd54b06. That's what I am using. These
are merged in Junio's next already, so you'll see them in master
someday. Meanwhile I can have it like this:

$ git clone git://git.kernel.org/pub/scm/git/git.git
$ cd git
$ git merge c2ca1d79dbd54b06
$ make && make test && make doc
$ make install install-doc

This will install the freshly compiled git in your home (~/bin,
~/share, ~/libexec, ...)

I would recommend to remove the debian's git first, BTW.

how can I do the difference between a patch with normal CR+LF (the autor use this format)
and a patch without CR+LF due to the webmail ?

Just replace the trailing CR+LF with just LF. The program named
"dos2unix" does that.