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

git am and Evoultion

From
Chris Packham <judge.packham@gmail.com>
Date
Feb 12, 2009, 22:13 UTC
Message-ID
<a038bef50902121413p784c2563l8823c7dc758a73@mail.gmail.com>
Hi,
I want to apply patches by running git am directly on one of my Evolution mail
folders. From what I've read this should be possible. The magic incantation
I'm using is
  git am -s -i -3 ~/.evolution/mail/local/patches

I seem to be running into a problem with CRLF differences. If I run the command mentioned above the patch fails to apply. If I extract the parts with git mailinfo and use git apply the patch fails.

If I use Evolution to save the file and run git am on the saved file no problems (I'm pretty sure Evolution is correcting the CRLF for me). Same deal if I run git mailinfo and dos2unix on the extracted patch.

So Is there something I'm missing here, do I need to tell git am or git apply about the line encoding? Do I need to tell Evolution something? Is it safe to run dos2unix on an Evolution mbox?

Caveat: I'm running an old version of git (1.5.4.5). I've been putting
off upgrading
as the corporate overlords are planning a wider distro version upgrade
which would
include a newer version of git.

Thanks, Chris

Next: Chris Packham
Message 1 of 2 in “git am and Evoultion”
  1. Chris PackhamFeb 12, 2009
  2. Chris PackhamFeb 13, 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.