git/list[1] front-page[2] threads[3] people[4] search[5] about
 

RE : trailling whitespace with git am ?

From
PFPICCA Frédéric-Emmanuel <frederic-emmanuel.picca@synchrotron-soleil.fr>
Date
Aug 14, 2009, 20:21 UTC
Message-ID
<606CC410B038E34CB97646A32D0EC0BF0181FABD@venusbis.synchrotron-soleil.fr>
In-Reply-To
<81b0412b0908141310x7e4acf4fgf4ea71cf53de6eea@mail.gmail.com>
> 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.
I am using git 1.6.3.3 debian unstable is it ok ?
In fact we saw that this problem was due to our webmail
the patch was attached to a mail and using the webmail interface a save to disk transform the CR -> CR LF
we tested it with gmail and the microsoft webmail

now the problem is that a patch with CR+ LF do not have the same signature that a patch with only CR.

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 ?

See you
Frederic
Previous: Alex RiesenNext: Junio C Hamano
Message 3 of 5 in “trailling whitespace with git am ?”
  1. PICCA Frédéric-EmmanuelAug 14, 2009
  2. Alex RiesenAug 14, 2009
  3. RE : trailling whitespace with git am ?PICCA Frédéric-Emmanuel, Aug 14, 2009
  4. Junio C HamanoAug 14, 2009
  5. RE : RE : trailling whitespace with git am ?PICCA Frédéric-Emmanuel, Aug 14, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.