{"thread":{"id":"17765","subject":"git am and Evoultion","startedAt":"2009-02-12T22:13:40Z","lastAt":"2009-02-13T00:47:13Z","messageCount":2,"participants":["Chris Packham"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"104440","messageId":"a038bef50902121413p784c2563l8823c7dc758a73@mail.gmail.com","threadId":"17765","inReplyTo":null,"subject":"git am and Evoultion","fromName":"Chris Packham","fromEmail":"judge.packham@gmail.com","sentAt":"2009-02-12T22:13:40Z","receivedAt":"2009-02-12T22:13:40Z","isPatch":false,"sender":{"key":"judge.packham@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155667?v=4"},"body":"Hi,\n\nI want to apply patches by running git am directly on one of my Evolution mail\nfolders. From what I've read this should be possible. The magic incantation\nI'm using is\n  git am -s -i -3 ~/.evolution/mail/local/patches\n\nI seem to be running into a problem with CRLF differences. If I run the command\nmentioned above the patch fails to apply. If I extract the parts with\ngit mailinfo and\nuse git apply the patch fails.\n\nIf I use Evolution to save the file and run git am on the saved file\nno problems (I'm\npretty sure Evolution is correcting the CRLF for me). Same deal if I\nrun git mailinfo\nand dos2unix on the extracted patch.\n\nSo Is there something I'm missing here, do I need to tell git am or\ngit apply about the\nline encoding? Do I need to tell Evolution something?  Is it safe to\nrun dos2unix on\nan Evolution mbox?\n\nCaveat: I'm running an old version of git (1.5.4.5). I've been putting\noff upgrading\nas the corporate overlords are planning a wider distro version upgrade\nwhich would\ninclude a newer version of git.\n\nThanks,\nChris\n"},{"id":"104463","messageId":"a038bef50902121647w13c83ceew8e8e3f68e98477c9@mail.gmail.com","threadId":"17765","inReplyTo":"a038bef50902121413p784c2563l8823c7dc758a73@mail.gmail.com","subject":"Re: git am and Evoultion","fromName":"Chris Packham","fromEmail":"judge.packham@gmail.com","sentAt":"2009-02-13T00:47:13Z","receivedAt":"2009-02-13T00:47:13Z","isPatch":false,"sender":{"key":"judge.packham@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155667?v=4"},"body":"On Fri, Feb 13, 2009 at 11:13 AM, Chris Packham <judge.packham@gmail.com> wrote:\n> Caveat: I'm running an old version of git (1.5.4.5). I've been putting\n> off upgrading as the corporate overlords are planning a wider\n> distro version upgrade which would include a newer version of git.\n\nAfter actually trying the newer version the CRLFs are handled nicely.\nSorry for the spam/not searching the list first.\n"}]}