Re: git on Windows (was: Re: git not fetching from origin...)

2009-06-08 Thread Trevor Daniels
Johannes Schindelin wrote Tuesday, May 26, 2009 2:10 PM Hi, On Tue, 26 May 2009, Carl D. Sorensen wrote: When I make my own patches, they're Unix line endings. Trevor, could you do a quick search for the fixes you've pushed, and identify the patches that caused the problem? You can

Re: git on Windows (was: Re: git not fetching from origin...)

2009-06-08 Thread Johannes Schindelin
Hi, On Mon, 8 Jun 2009, Trevor Daniels wrote: Johannes Schindelin wrote Tuesday, May 26, 2009 2:10 PM On Tue, 26 May 2009, Carl D. Sorensen wrote: When I make my own patches, they're Unix line endings. Trevor, could you do a quick search for the fixes you've pushed, and

Re: git on Windows (was: Re: git not fetching from origin...)

2009-05-26 Thread Trevor Daniels
Johannes Schindelin wrote Tuesday, May 26, 2009 12:05 AM Hi, On Mon, 25 May 2009, Mark Polesky wrote: 1.5.2 Installing git 0) Full installer or portable application? This is my fault; PortableGit is a recent addition. I'd recommend the installer (but not the full installer available

Re: git on Windows (was: Re: git not fetching from origin...)

2009-05-26 Thread Trevor Daniels
Johannes Schindelin wrote Tuesday, May 26, 2009 8:53 AM Hi, On Tue, 26 May 2009, Trevor Daniels wrote: Johannes Schindelin wrote Tuesday, May 26, 2009 12:05 AM On Mon, 25 May 2009, Mark Polesky wrote: 1.5.2 Installing git 0) Full installer or portable application? This is my

Re: git on Windows (was: Re: git not fetching from origin...)

2009-05-26 Thread Johannes Schindelin
Hi, On Tue, 26 May 2009, Trevor Daniels wrote: Johannes Schindelin wrote Tuesday, May 26, 2009 8:53 AM On Tue, 26 May 2009, Trevor Daniels wrote: Johannes Schindelin wrote Tuesday, May 26, 2009 12:05 AM On Mon, 25 May 2009, Mark Polesky wrote: 1.5.2 Installing git

Re: git on Windows (was: Re: git not fetching from origin...)

2009-05-26 Thread Trevor Daniels
Johannes Schindelin Tuesday, May 26, 2009 9:37 AM 4) Recommend a CR/LF behavior. Use Unix style line endings? Use Windows style line endings? Commit line endings as they are? Again, I think the default is sane here (unless somebody fscks up and

Re: git on Windows (was: Re: git not fetching from origin...)

2009-05-26 Thread Mark Polesky
To: Johannes Schindelin johannes.schinde...@gmx.de Cc: Mark Polesky markpole...@yahoo.com; Jonathan Kulp jonlancek...@gmail.com; Carl D. Sorensen c_soren...@byu.edu; lilypond-devel lilypond-devel@gnu.org Sent: Tuesday, May 26, 2009 1:57:07 AM Subject: Re: git on Windows (was: Re: git not fetching

Re: git on Windows (was: Re: git not fetching from origin...)

2009-05-26 Thread Johannes Schindelin
Hi, On Tue, 26 May 2009, Mark Polesky wrote: When I installed git, I selected Unix style line endings. Now every time I git commit -a or even git diff HEAD I get this warning for *each* modified file: warning: CRLF will be replaced by LF in filename. Please do not top-post. At least

Re: git on Windows (was: Re: git not fetching from origin...)

2009-05-26 Thread Carl D. Sorensen
On 5/26/09 2:57 AM, Trevor Daniels t.dani...@treda.co.uk wrote: Johannes Schindelin Tuesday, May 26, 2009 9:37 AM 4) Recommend a CR/LF behavior. Use Unix style line endings? Use Windows style line endings? Commit line endings as they are? Again, I think the default

Re: git on Windows (was: Re: git not fetching from origin...)

2009-05-26 Thread Johannes Schindelin
Hi, On Tue, 26 May 2009, Carl D. Sorensen wrote: When I make my own patches, they're Unix line endings. Trevor, could you do a quick search for the fixes you've pushed, and identify the patches that caused the problem? You can let Git search for you: $ git log -S$(printf \r) If

Re: git on Windows (was: Re: git not fetching from origin...)

2009-05-26 Thread Carl D. Sorensen
On 5/26/09 7:10 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi, On Tue, 26 May 2009, Carl D. Sorensen wrote: When I make my own patches, they're Unix line endings. Trevor, could you do a quick search for the fixes you've pushed, and identify the patches that caused the

Re: Mac OS Line endings (was Re: git on Windows (was: Re: git not fetching from origin...))

2009-05-26 Thread Carl D. Sorensen
Hi, In checking this out, it appears that nearly all of the MacOS line endings (CR-only) were in musicxml regression test files from Reinhold. So apparently my hypothesis/concern was invalid. Fortunately, I haven't been adding CR-only endings when I pushed other people's patches. Carl

Re: git on Windows (was: Re: git not fetching from origin...)

2009-05-26 Thread Johannes Schindelin
Hi, On Tue, 26 May 2009, Mark Polesky wrote: Johannes Schindelin wrote: I think you could replace the input with true in you /etc/gitconfig's autocrlf setting in the [core] section. This should take care of the issue. It does, thanks. Great! Ciao, Dscho

git on Windows (was: Re: git not fetching from origin...)

2009-05-25 Thread Mark Polesky
Trevor Daniels wrote: I'd be happy to make changes to the Windows git section of the CG if someone can point out the bit or bits that are difficult to understand. Trevor, here are some unanswered questions that I think should be answered in the CG. I'll have more later, but I'll start with

Re: git on Windows (was: Re: git not fetching from origin...)

2009-05-25 Thread Johannes Schindelin
Hi, On Mon, 25 May 2009, Mark Polesky wrote: 1.5.2 Installing git 0) Full installer or portable application? This is my fault; PortableGit is a recent addition. I'd recommend the installer (but not the full installer available from msysgit.googlecode.com). 1) Describe Windows