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

Re: trailling whitespace with git am ?

From
Alex Riesen <raa.lkml@gmail.com>
Date
Aug 14, 2009, 20:10 UTC
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>:

Show 8 quoted lines
> 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.

Previous: PICCA Frédéric-EmmanuelNext: PICCA Frédéric-Emmanuel
Message 2 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.