git am and Evoultion

git am and Evoultion

[Chris Packham]

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

Re: git am and Evoultion

[Chris Packham]

On Fri, Feb 13, 2009 at 11:13 AM, Chris Packham <judge.packham@gmail.com> wrote:
> 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.

After actually trying the newer version the CRLFs are handled nicely.
Sorry for the spam/not searching the list first.