Re: git on Windows (was: Re: git not fetching from origin...)
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 > > > identify the patches that caused the problem? > > > > You can let Git search for you: > > > > $ git log -S"$(printf "\r")" > > > > If you want to see the corresponding patches, too, say > > > > $ git log -S"$(printf "\r")" -p > > > > Neither of these git commands produced any output > in my local (Windows) repo There are some things that Just Don't Work On Windows, although I do not see a reason in this case why that should happen here... Ciao, Dscho ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
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 let Git search for you: $ git log -S"$(printf "\r")" If you want to see the corresponding patches, too, say $ git log -S"$(printf "\r")" -p Neither of these git commands produced any output in my local (Windows) repo, but the latest 5 fixes for Mac line endings which I have pushed are: 7643225b3deedaed6198a89fde011efec1a2f47c 2009-04-06 e655daf816a1cfa8a41a535a34eed106cef49ec9 2008-12-09 4df51915f96d56a76345d35c98b7795a01bd6540 2008-11-30 b314856c905ac499d115564e6db6d52ba3b92026 2008-11-19 0c582192866e9f07d45513a8431fbe2c38fac9b7 2008-11-17 The corresponding commits which produced the Mac endings were (I think): 3684489ec07c20677c11cf047db95ee7b4857c78 3de153c685a890d8b56aa4ec9edfc7600ceacd6e f22ee8a434f0c884ea2ce6bbb8d5b3a3167c2f0b (plus others?) 3acc3f7df6492e6334619ae708bee13180028a4d afcbe5d595f910a5ebe6040f201957d0361ff8fd (Sorry for the delayed reply - I had a family bereavement to attend to recently) Trevor ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
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 ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
Johannes Schindelin wrote: > Please do not top-post. At least remove the stuff you are not > replying to. oops - sorry. > 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. - Mark ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Mac OS Line endings (was Re: git on Windows (was: Re: git not fetching from origin...))
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 ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
On 5/26/09 7:10 AM, "Johannes Schindelin" 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 problem? > > You can let Git search for you: > > $ git log -S"$(printf "\r")" > > If you want to see the corresponding patches, too, say > > $ git log -S"$(printf "\r")" -p Thanks, Dscho. Carl ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
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 you want to see the corresponding patches, too, say $ git log -S"$(printf "\r")" -p Ciao, Dscho ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
On 5/26/09 2:57 AM, "Trevor Daniels" 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 is sane here (unless somebody >> fscks up and >> commits files with CR/LF line endings). > > Or Mac line endings. > > It is essential to use the default in my opinion, > so I'll make this clear. Perhaps I should also > mention that any files pushed (by others) to > remote/origin/master with Mac line endings screw > up a Windows respository when pulled. The only > way out, as far as I have been able to discover, > is for someone with write access to fix them > immediately. Mac line endings will pretty much screw everybody, including Mac users, as Git's diff engine (which is responsible for merging, too) relies on LF being the last byte in every line. But then, I am not aware of anyone managing to get LilyPond to run on MacOS < 10.*, and on MacOSX, the native line ending is LF. >>> >>> Even so, Mac line endings have found their way >>> into Lily's remote/origin/master several times >>> in the last couple of years. I thought only >>> Windows was affected, as no one else seemed to be >>> concerned about it. I fixed them as soon as >>> they appeared. >> >> Oh... Well, you probably did not do much merging on these files as >> long as >> they were CR-only, I guess... ;-) > > Exactly so! The first time it happened was > quite traumatic. Now I know what to do it's > just a nuisance. Fortunately they show up in > my repo as soon as I try to merge after fetching > from remote, so I spot them right away and push a > fix. I suppose that CR-only endings might come from me, using a Mac with Entourage as my email client. When I save a patch file from Entourage as text, it shows up as CR-only endings. 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? Thanks, Carl ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
Hi, On Tue, 26 May 2009, Mark Polesky wrote: > When I installed git, I selected Unix style line endings. > Now every time I or even > I get this warning for *each* modified file: > > warning: CRLF will be replaced by LF in . Please do not top-post. At least remove the stuff you are not replying to. 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. If not, please report, then I will give you the whole story so that you can fix it on your side. Ciao, Dscho ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
When I installed git, I selected Unix style line endings. Now every time I or even I get this warning for *each* modified file: warning: CRLF will be replaced by LF in . - Mark - Original Message > From: Trevor Daniels > To: Johannes Schindelin > Cc: Mark Polesky ; Jonathan Kulp > ; Carl D. Sorensen ; > lilypond-devel > Sent: Tuesday, May 26, 2009 1:57:07 AM > Subject: Re: git on Windows (was: Re: git not fetching from origin...) > > > 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 > >> > > > commits files with CR/LF line endings). > >> > > > >> > > Or Mac line endings. > >> > > > >> > > It is essential to use the default in my opinion, > >> > > so I'll make this clear. Perhaps I should also > >> > > mention that any files pushed (by others) to > >> > > remote/origin/master with Mac line endings screw > >> > > up a Windows respository when pulled. The only > >> > > way out, as far as I have been able to discover, > >> > > is for someone with write access to fix them > >> > > immediately. > >> > > >> > Mac line endings will pretty much screw everybody, including > Mac > >> > users, > as > >> > Git's diff engine (which is responsible for merging, too) > relies on LF > >> > being the last byte in every line. > >> > > >> > But then, I am not aware of anyone managing to get LilyPond to > run on > >> > MacOS < 10.*, and on MacOSX, the native line ending is LF. > >> > >> Even so, Mac line endings have found their way > >> into Lily's remote/origin/master several times > >> in the last couple of years. I thought only > >> Windows was affected, as no one else seemed to be > >> concerned about it. I fixed them as soon as > >> they appeared. > > > > Oh... Well, you probably did not do much merging on these files as long as > > they were CR-only, I guess... ;-) > > Exactly so! The first time it happened was > quite traumatic. Now I know what to do it's > just a nuisance. Fortunately they show up in > my repo as soon as I try to merge after fetching > from remote, so I spot them right away and push a > fix. > > Trevor ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
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 > > > commits files with CR/LF line endings). > > > > Or Mac line endings. > > > > It is essential to use the default in my opinion, > > so I'll make this clear. Perhaps I should also > > mention that any files pushed (by others) to > > remote/origin/master with Mac line endings screw > > up a Windows respository when pulled. The only > > way out, as far as I have been able to discover, > > is for someone with write access to fix them > > immediately. > > Mac line endings will pretty much screw everybody, including > Mac users, as > Git's diff engine (which is responsible for merging, too) > relies on LF > being the last byte in every line. > > But then, I am not aware of anyone managing to get LilyPond to > run on > MacOS < 10.*, and on MacOSX, the native line ending is LF. Even so, Mac line endings have found their way into Lily's remote/origin/master several times in the last couple of years. I thought only Windows was affected, as no one else seemed to be concerned about it. I fixed them as soon as they appeared. Oh... Well, you probably did not do much merging on these files as long as they were CR-only, I guess... ;-) Exactly so! The first time it happened was quite traumatic. Now I know what to do it's just a nuisance. Fortunately they show up in my repo as soon as I try to merge after fetching from remote, so I spot them right away and push a fix. Trevor ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
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 > > > > > > > > > > 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). > > > > > > Yes, PortableGit wasn't there when I wrote this section. > > > I'll try to find some words that distinguish the options > > > clearly, but the names are so similar it's not easy. > > > > I'd just say: don't use PortableGit. It is not a full installation and > > meant to enable you to take Git on a USB stick with you. Hardly the setup > > with LilyPond. > > OK, that's what I had in mind. Thanks for the confirmation. Heh, you're welcome! > > > > > 3) Recommend an SSH executable. OpenSSH or PLink? Or maybe > > > > > briefly describe the difference or link to a description? > > > > > > > > Both have their own set of problems; it is basically up to you which > > > > poison you choose. > > > > > > > > > > SSH is required only if you have authority to push > > > to remote/origin. I've assumed the reader (as someone > > > new to git) would not have this, so it's not mentioned. > > > How to get write access to the remote repository would need > > > a whole section to itself! > > > > Exactly. So why not say "it does not matter what you choose here until > > you have direct push permissions to the Git repository"? > > Or maybe, "SSH is not required until you have direct push permissions to > the Git repository."? Much better. > > > > > 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 > > > > commits files with CR/LF line endings). > > > > > > Or Mac line endings. > > > > > > It is essential to use the default in my opinion, > > > so I'll make this clear. Perhaps I should also > > > mention that any files pushed (by others) to > > > remote/origin/master with Mac line endings screw > > > up a Windows respository when pulled. The only > > > way out, as far as I have been able to discover, > > > is for someone with write access to fix them > > > immediately. > > > > Mac line endings will pretty much screw everybody, including Mac users, as > > Git's diff engine (which is responsible for merging, too) relies on LF > > being the last byte in every line. > > > > But then, I am not aware of anyone managing to get LilyPond to run on > > MacOS < 10.*, and on MacOSX, the native line ending is LF. > > Even so, Mac line endings have found their way > into Lily's remote/origin/master several times > in the last couple of years. I thought only > Windows was affected, as no one else seemed to be > concerned about it. I fixed them as soon as > they appeared. Oh... Well, you probably did not do much merging on these files as long as they were CR-only, I guess... ;-) Thanks, Dscho ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
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 fault; PortableGit is a recent addition. I'd > recommend the > installer (but not the "full" installer available from > msysgit.googlecode.com). Yes, PortableGit wasn't there when I wrote this section. I'll try to find some words that distinguish the options clearly, but the names are so similar it's not easy. I'd just say: don't use PortableGit. It is not a full installation and meant to enable you to take Git on a USB stick with you. Hardly the setup with LilyPond. OK, that's what I had in mind. Thanks for the confirmation. > > 3) Recommend an SSH executable. OpenSSH or PLink? Or maybe > > briefly describe the difference or link to a description? > > Both have their own set of problems; it is basically up to you > which > poison you choose. > SSH is required only if you have authority to push to remote/origin. I've assumed the reader (as someone new to git) would not have this, so it's not mentioned. How to get write access to the remote repository would need a whole section to itself! Exactly. So why not say "it does not matter what you choose here until you have direct push permissions to the Git repository"? Or maybe, "SSH is not required until you have direct push permissions to the Git repository."? > > 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 > commits files with CR/LF line endings). Or Mac line endings. It is essential to use the default in my opinion, so I'll make this clear. Perhaps I should also mention that any files pushed (by others) to remote/origin/master with Mac line endings screw up a Windows respository when pulled. The only way out, as far as I have been able to discover, is for someone with write access to fix them immediately. Mac line endings will pretty much screw everybody, including Mac users, as Git's diff engine (which is responsible for merging, too) relies on LF being the last byte in every line. But then, I am not aware of anyone managing to get LilyPond to run on MacOS < 10.*, and on MacOSX, the native line ending is LF. Even so, Mac line endings have found their way into Lily's remote/origin/master several times in the last couple of years. I thought only Windows was affected, as no one else seemed to be concerned about it. I fixed them as soon as they appeared. Trevor ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
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 fault; PortableGit is a recent addition. I'd recommend the > > installer (but not the "full" installer available from > > msysgit.googlecode.com). > > Yes, PortableGit wasn't there when I wrote this section. > I'll try to find some words that distinguish the options > clearly, but the names are so similar it's not easy. I'd just say: don't use PortableGit. It is not a full installation and meant to enable you to take Git on a USB stick with you. Hardly the setup with LilyPond. > > > 1) Describe Windows Explorer integration. > > > > > > something like: > > > Selecting and/or > > > will add the option(s) to the pop-up menu when you > > > right-click > > > on a folder. > > > > And I thought this was really well described in the Git Installer. > > I never did this myself; I simply start bash and cd to > the repo. But I can see it would be useful. I'll > add a bit referring to the instructions in the installer. > > > > 2) Recommend a command line option. > > > Use Git Bash only? > > > Run Git from the Windows Command Prompt? > > > Run Git and included Unix tools from the Windows Command > > > Prompt? > > > > Is there really a need to recommend anything else than the default? > > No, but I can see this can be made clearer. > > > > 3) Recommend an SSH executable. OpenSSH or PLink? Or maybe > > > briefly describe the difference or link to a description? > > > > Both have their own set of problems; it is basically up to you which > > poison you choose. > > > > SSH is required only if you have authority to push > to remote/origin. I've assumed the reader (as someone > new to git) would not have this, so it's not mentioned. > How to get write access to the remote repository would need > a whole section to itself! Exactly. So why not say "it does not matter what you choose here until you have direct push permissions to the Git repository"? > > > 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 > > commits files with CR/LF line endings). > > Or Mac line endings. > > It is essential to use the default in my opinion, > so I'll make this clear. Perhaps I should also > mention that any files pushed (by others) to > remote/origin/master with Mac line endings screw > up a Windows respository when pulled. The only > way out, as far as I have been able to discover, > is for someone with write access to fix them > immediately. Mac line endings will pretty much screw everybody, including Mac users, as Git's diff engine (which is responsible for merging, too) relies on LF being the last byte in every line. But then, I am not aware of anyone managing to get LilyPond to run on MacOS < 10.*, and on MacOSX, the native line ending is LF. Ciao, Dscho ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
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 from msysgit.googlecode.com). Yes, PortableGit wasn't there when I wrote this section. I'll try to find some words that distinguish the options clearly, but the names are so similar it's not easy. 1) Describe Windows Explorer integration. something like: Selecting and/or will add the option(s) to the pop-up menu when you right-click on a folder. And I thought this was really well described in the Git Installer. I never did this myself; I simply start bash and cd to the repo. But I can see it would be useful. I'll add a bit referring to the instructions in the installer. 2) Recommend a command line option. Use Git Bash only? Run Git from the Windows Command Prompt? Run Git and included Unix tools from the Windows Command Prompt? Is there really a need to recommend anything else than the default? No, but I can see this can be made clearer. 3) Recommend an SSH executable. OpenSSH or PLink? Or maybe briefly describe the difference or link to a description? Both have their own set of problems; it is basically up to you which poison you choose. SSH is required only if you have authority to push to remote/origin. I've assumed the reader (as someone new to git) would not have this, so it's not mentioned. How to get write access to the remote repository would need a whole section to itself! 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 commits files with CR/LF line endings). Or Mac line endings. It is essential to use the default in my opinion, so I'll make this clear. Perhaps I should also mention that any files pushed (by others) to remote/origin/master with Mac line endings screw up a Windows respository when pulled. The only way out, as far as I have been able to discover, is for someone with write access to fix them immediately. Trevor ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: git on Windows (was: Re: git not fetching from origin...)
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 Explorer integration. > > something like: > Selecting and/or > will add the option(s) to the pop-up menu when you right-click > on a folder. And I thought this was really well described in the Git Installer. > 2) Recommend a command line option. > Use Git Bash only? > Run Git from the Windows Command Prompt? > Run Git and included Unix tools from the Windows Command Prompt? Is there really a need to recommend anything else than the default? > 3) Recommend an SSH executable. OpenSSH or PLink? Or maybe > briefly describe the difference or link to a description? Both have their own set of problems; it is basically up to you which poison you choose. > 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 commits files with CR/LF line endings). Ciao, Dscho ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
