Re: CM 1.1 git question

[Trevor Daniels]

Jonathan Kulp wrote Wednesday, February 18, 2009 10:04 PM

> Johannes Schindelin wrote:
> > Hi,
> >
> > On Wed, 18 Feb 2009, Jonathan Kulp wrote:
> >
> > > I realized after I sent it, though, that I sent it from my 
> > > Thunderbird email client and this historically has jacked up the 
> > > line endings.
> >
> > We had a very "interesting" discussion with one of the 
> > Thunderbirds on the Git list (who I dragged into the discussion). 
> > It seems that the Mozilla people refuse to accept that they cause 
> > major pain with their stance.
> >
> > So I started writing a Thunderbird extension that hopefully will 
> > help matters by providing a "File>Send Patch(es)..." menu entry. 
> > It is extremely alpha for the moment, I have one success story 
> > and one failure story, so I am quite unsure if it works.
> >
> > If you're interested to test, let me know and I will send you an 
> > .xpi.
> >
> > Ciao,
> > Dscho
> I'd be happy to try this out.  I don't know that it's solely a 
> Mozilla issue in my case, though, because IIRC I had the same 
> problem when I sent files to Carl using Mutt.  Something about my 
> ISP maybe.  The only way I could get files sent properly, 
> preserving the unix endings was to use a web-based email 
> interface, which I hate to do.  I'll do it if that's what it takes 
> to preserve the line endings, I just have to *remember* to do it 
> because my default action is to send from Thunderbird.

Jon, the recent patch I pushed for you (lsr-work.patch) was
sent using Thunderbird but, as it was attached, the line
endings were correctly Unix (LF only).  It did have white
space at the end of most (every, maybe) lines, but this is
easily fixed - I routinely check and remove white space
anyway.

The patch itself didn't apply directly due to your earlier
practice of doing your editing outside git - my git has
no knowledge of one of the files used in the comparison,
so it refused to apply it.  As it was a simple patch it
was easily pasted in, so no problem.

Incidentally, the precise line endings are not significant
if you send them to someone who uses git under Windows (me),
as git under Windows silently converts all line endings to
Unix during the commit (if necessary) by default.

Trevor