Re: problem with checking out staging branch
2012/1/4 David Kastrup d...@gnu.org: Janek Warchoł janek.lilyp...@gmail.com writes: 2012/1/3 Janek Warchoł janek.lilyp...@gmail.com: 2012/1/3 David Kastrup d...@gnu.org: You don't have staging in your fetch line. That's why I recommended fetching * instead of just master. Ah!! You see, i wasn't smart enough to understand what you wrote about that asterisk. Everything works fine now, and i understand. Great! Many thanks!! Fetching all branches created a new problem: can i tell git that it should rebase branches against master by default? Because now when i checked a non-master, non-staging local branch and called 'git pull -r' he said You asked me to pull without telling me which branch you want to rebase against, and 'branch.mook.merge' in your configuration file does not tell me, either. Please specify which branch you want to use on the command line and try again (e.g. 'git pull repository refspec'). See git-pull(1) for details. I usually rebase manually and instead do just git fetch. Of course i can do what he suggests, but it means either - a lot of typing 'git pull -r origin refs/heads/master' (if i got it right) - editing config file every time i create a branch (not nice). You can just create the branch as git checkout -b new-branch origin and git will know where to pull from. And you can always do git branch --set-upstream new-branch origin after having created it. ok, thanks. Janek ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
2012/1/3 Graham Percival gra...@percival-music.ca: On Tue, Jan 03, 2012 at 08:45:45PM +0100, Janek Warchoł wrote: I guess i should change it into this: [core] [branch master] It's not a bad thing that we can ask git wizards to give us custom advice on our .git/config, but this shouldn't be necessary. I mean, the only time I've ever edited .git/config was to give myself push ability, following the CG. Once you've got your system working, Janek, could you (in a separate directory) do a fresh git clone, following the instructions in http://lilypond.org/doc/v2.15/Documentation/contributor/setting-up and nowhere else, then see what happens if you follow the instructions in the current patch for 2100 ? Everything looks fine, i can diff and checkout staging branch. Looks like only the transition was painful. cheers, Janek ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
problem with checking out staging branch
Hi, i have problems with staging branch. I understand what it's supposed to do and how branches work; the problem is purely technical. Firstly, I cannot diff it, unlike master branch: calling 'git diff origin/master' shows me a diff between the local branch i'm on and the master branch from remote origin, but calling 'git diff origin/staging' says fatal: ambiguous argument 'origin/staging': unknown revision or path not in the working tree. Use '--' to separate paths from revisions - ? I concluded that i have to add staging branch (tell git about its existence); i tried git remote add -ft staging -m staging origin git://git.sv.gnu.org/lilypond.git/ (in analogy to what is written in http://lilypond.org/doc/v2.15/Documentation/contributor/downloading-remote-branches about downloading master), but git protested fatal: remote origin already exists. i suppose this means that 'git remote' is used for whole locations (references), not branches. How can i add a branch, then? I've searched CG but found nothing. I finally tried 'git checkout staging' and surprisingly it worked, but git message was a bit alarming: Branch staging set up to track remote branch staging from testorigin. Switched to a new branch 'staging' what is testorigin? It is possible that it was something i accidentally set up 3 months ago, i don't remember; nevertheless this doesn't make much sense to me. Can you help? cheers, Janek ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
Janek Warchoł janek.lilyp...@gmail.com writes: git remote add -ft staging -m staging origin git://git.sv.gnu.org/lilypond.git/ (in analogy to what is written in http://lilypond.org/doc/v2.15/Documentation/contributor/downloading-remote-branches about downloading master), but git protested fatal: remote origin already exists. i suppose this means that 'git remote' is used for whole locations (references), not branches. How can i add a branch, then? I've searched CG but found nothing. I finally tried 'git checkout staging' and surprisingly it worked, but git message was a bit alarming: Branch staging set up to track remote branch staging from testorigin. Switched to a new branch 'staging' what is testorigin? It is possible that it was something i accidentally set up 3 months ago, i don't remember; nevertheless this doesn't make much sense to me. Can you help? Personally, I've mostly given up with the git command line for config stuff. Just post the contents of .git/config and we'll go from there, seeing what you should do using a text editor. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
2012/1/3 David Kastrup d...@gnu.org: Personally, I've mostly given up with the git command line for config stuff. Just post the contents of .git/config and we'll go from there, seeing what you should do using a text editor. [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [branch master] remote = origin merge = refs/heads/master rebase = true [gui] wmstate = normal geometry = 1386x631+0+51 216 192 [rietveld] server = codereview.appspot.com cc = lilypond-devel@gnu.org user = lemniskata.bernoullego [branch arp-arrow] rietveldissue = 4793041 rietveldpatchset = 1 [branch narrow-acc] rietveldissue = 4790043 rietveldpatchset = 1 [branch tremolo] rietveldissue = 4636081 rietveldpatchset = 49001 [remote origin] url = ssh://jan...@git.sv.gnu.org/srv/git/lilypond.git fetch = +refs/heads/master:refs/remotes/origin/master [remote aspiers] url = git://github.com/aspiers/lilypond.git fetch = +refs/heads/*:refs/remotes/aspiers/* [branch new-tremolo] [remote testorigin] url = ssh://jan...@git.sv.gnu.org/srv/git/lilypond.git fetch = +refs/heads/*:refs/remotes/testorigin/* [branch staging] remote = testorigin merge = refs/heads/staging I guess i should change it into this: [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [branch master] remote = origin merge = refs/heads/master rebase = true [gui] wmstate = normal geometry = 1386x631+0+51 216 192 [rietveld] server = codereview.appspot.com cc = lilypond-devel@gnu.org user = janek.lilypond [branch arp-arrow] rietveldissue = 4793041 rietveldpatchset = 1 [branch narrow-acc] rietveldissue = 4790043 rietveldpatchset = 1 [branch tremolo] rietveldissue = 4636081 rietveldpatchset = 49001 [remote origin] url = ssh://jan...@git.sv.gnu.org/srv/git/lilypond.git fetch = +refs/heads/master:refs/remotes/origin/master [remote aspiers] url = git://github.com/aspiers/lilypond.git fetch = +refs/heads/*:refs/remotes/aspiers/* [branch new-tremolo] [branch staging] remote = origin merge = refs/heads/staging rebase = true Am i right? ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
Janek Warchoł janek.lilyp...@gmail.com writes: I guess i should change it into this: [remote origin] url = ssh://jan...@git.sv.gnu.org/srv/git/lilypond.git fetch = +refs/heads/master:refs/remotes/origin/master I'd put * instead of twice master here (easier than multiple fetch lines). [remote aspiers] url = git://github.com/aspiers/lilypond.git fetch = +refs/heads/*:refs/remotes/aspiers/* And it does not look like you need the remote aspiers. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
2012/1/3 David Kastrup d...@gnu.org: Janek Warchoł janek.lilyp...@gmail.com writes: I guess i should change it into this: [remote origin] url = ssh://jan...@git.sv.gnu.org/srv/git/lilypond.git fetch = +refs/heads/master:refs/remotes/origin/master I'd put * instead of twice master here (easier than multiple fetch lines). I don't get it. Anyway, its only a readability enhancement? [remote aspiers] url = git://github.com/aspiers/lilypond.git fetch = +refs/heads/*:refs/remotes/aspiers/* And it does not look like you need the remote aspiers. Indeed, his patches were pushed. Well, i changed config file, can check out branch staging, but still cannot diff it: fatal: ambiguous argument 'origin/staging': unknown revision or path not in the working tree. Use '--' to separate paths from revisions i don't understand what he says... Janek ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
2012/1/3 Janek Warchoł janek.lilyp...@gmail.com: Well, i changed config file, can check out branch staging, but still cannot diff it: fatal: ambiguous argument 'origin/staging': unknown revision or path not in the working tree. Use '--' to separate paths from revisions i don't understand what he says... However, it looks that i can push to staging. Can you confirm that Benko Pal's fix for http://code.google.com/p/lilypond/issues/detail?id=2109 was pushed properly to staging? From what i see, it got ID 9f24e79a945ec4ab000d3e09ff2d2ac8208e2246. thanks, Janek ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
Hello, 2012/1/3 Janek Warchoł janek.lilyp...@gmail.com: 2012/1/3 Janek Warchoł janek.lilyp...@gmail.com: Well, i changed config file, can check out branch staging, but still cannot diff it: fatal: ambiguous argument 'origin/staging': unknown revision or path not in the working tree. Use '--' to separate paths from revisions i don't understand what he says... However, it looks that i can push to staging. Can you confirm that Benko Pal's fix for http://code.google.com/p/lilypond/issues/detail?id=2109 was pushed properly to staging? From what i see, it got ID 9f24e79a945ec4ab000d3e09ff2d2ac8208e2246. thanks, Janek LGTM http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=shortlog;h=refs/heads/staging -- -- James ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
Janek Warchoł janek.lilyp...@gmail.com writes: 2012/1/3 David Kastrup d...@gnu.org: Janek Warchoł janek.lilyp...@gmail.com writes: I guess i should change it into this: [remote origin] url = ssh://jan...@git.sv.gnu.org/srv/git/lilypond.git fetch = +refs/heads/master:refs/remotes/origin/master I'd put * instead of twice master here (easier than multiple fetch lines). I don't get it. Anyway, its only a readability enhancement? No. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
Janek Warchoł janek.lilyp...@gmail.com writes: 2012/1/3 Janek Warchoł janek.lilyp...@gmail.com: Well, i changed config file, can check out branch staging, but still cannot diff it: fatal: ambiguous argument 'origin/staging': unknown revision or path not in the working tree. Use '--' to separate paths from revisions i don't understand what he says... You don't have staging in your fetch line. That's why I recommended fetching * instead of just master. However, it looks that i can push to staging. Can you confirm that Benko Pal's fix for http://code.google.com/p/lilypond/issues/detail?id=2109 was pushed properly to staging? From what i see, it got ID 9f24e79a945ec4ab000d3e09ff2d2ac8208e2246. That's there. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
2012/1/3 James pkx1...@gmail.com: Hello, 2012/1/3 Janek Warchoł janek.lilyp...@gmail.com: However, it looks that i can push to staging. Can you confirm that Benko Pal's fix for http://code.google.com/p/lilypond/issues/detail?id=2109 was pushed properly to staging? From what i see, it got ID 9f24e79a945ec4ab000d3e09ff2d2ac8208e2246. LGTM Thanks! 2012/1/3 David Kastrup d...@gnu.org: Janek Warchoł janek.lilyp...@gmail.com writes: 2012/1/3 David Kastrup d...@gnu.org: Janek Warchoł janek.lilyp...@gmail.com writes: I guess i should change it into this: [remote origin] url = ssh://jan...@git.sv.gnu.org/srv/git/lilypond.git fetch = +refs/heads/master:refs/remotes/origin/master I'd put * instead of twice master here (easier than multiple fetch lines). I don't get it. Anyway, its only a readability enhancement? No. Ah, ok, i understand now! 2012/1/3 David Kastrup d...@gnu.org: Janek Warchoł janek.lilyp...@gmail.com writes: 2012/1/3 Janek Warchoł janek.lilyp...@gmail.com: Well, i changed config file, can check out branch staging, but still cannot diff it: fatal: ambiguous argument 'origin/staging': unknown revision or path not in the working tree. Use '--' to separate paths from revisions i don't understand what he says... You don't have staging in your fetch line. That's why I recommended fetching * instead of just master. Ah!! You see, i wasn't smart enough to understand what you wrote about that asterisk. Everything works fine now, and i understand. Great! Many thanks!! Janek ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
2012/1/3 Janek Warchoł janek.lilyp...@gmail.com: 2012/1/3 David Kastrup d...@gnu.org: You don't have staging in your fetch line. That's why I recommended fetching * instead of just master. Ah!! You see, i wasn't smart enough to understand what you wrote about that asterisk. Everything works fine now, and i understand. Great! Many thanks!! Fetching all branches created a new problem: can i tell git that it should rebase branches against master by default? Because now when i checked a non-master, non-staging local branch and called 'git pull -r' he said You asked me to pull without telling me which branch you want to rebase against, and 'branch.mook.merge' in your configuration file does not tell me, either. Please specify which branch you want to use on the command line and try again (e.g. 'git pull repository refspec'). See git-pull(1) for details. If you often rebase against the same branch, you may want to use something like the following in your configuration file: [branch mook] remote = nickname merge = remote-ref rebase = true [remote nickname] url = url fetch = refspec See git-config(1) for details. Of course i can do what he suggests, but it means either - a lot of typing 'git pull -r origin refs/heads/master' (if i got it right) - editing config file every time i create a branch (not nice). Ideas? Janek ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
On Tue, Jan 03, 2012 at 08:45:45PM +0100, Janek Warchoł wrote: I guess i should change it into this: [core] [branch master] It's not a bad thing that we can ask git wizards to give us custom advice on our .git/config, but this shouldn't be necessary. I mean, the only time I've ever edited .git/config was to give myself push ability, following the CG. Once you've got your system working, Janek, could you (in a separate directory) do a fresh git clone, following the instructions in http://lilypond.org/doc/v2.15/Documentation/contributor/setting-up and nowhere else, then see what happens if you follow the instructions in the current patch for 2100 ? I think *that's* where we should focus the attention. Get the CG clear on this point (which will involve deleting most of 3.2.2, but that comes later), so that we don't need to do this song and dance for every single developer. Cheers, - Graham ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
2012/1/3 Graham Percival gra...@percival-music.ca: On Tue, Jan 03, 2012 at 08:45:45PM +0100, Janek Warchoł wrote: I guess i should change it into this: [core] [branch master] It's not a bad thing that we can ask git wizards to give us custom advice on our .git/config, but this shouldn't be necessary. I mean, the only time I've ever edited .git/config was to give myself push ability, following the CG. Once you've got your system working, Janek, could you (in a separate directory) do a fresh git clone, following the instructions in http://lilypond.org/doc/v2.15/Documentation/contributor/setting-up and nowhere else, then see what happens if you follow the instructions in the current patch for 2100 ? I think *that's* where we should focus the attention. Get the CG clear on this point (which will involve deleting most of 3.2.2, but that comes later), so that we don't need to do this song and dance for every single developer. Ok, i'll do it tomorrow (hopefully). cheers, Janek ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: problem with checking out staging branch
Janek Warchoł janek.lilyp...@gmail.com writes: 2012/1/3 Janek Warchoł janek.lilyp...@gmail.com: 2012/1/3 David Kastrup d...@gnu.org: You don't have staging in your fetch line. That's why I recommended fetching * instead of just master. Ah!! You see, i wasn't smart enough to understand what you wrote about that asterisk. Everything works fine now, and i understand. Great! Many thanks!! Fetching all branches created a new problem: can i tell git that it should rebase branches against master by default? Because now when i checked a non-master, non-staging local branch and called 'git pull -r' he said You asked me to pull without telling me which branch you want to rebase against, and 'branch.mook.merge' in your configuration file does not tell me, either. Please specify which branch you want to use on the command line and try again (e.g. 'git pull repository refspec'). See git-pull(1) for details. I usually rebase manually and instead do just git fetch. Of course i can do what he suggests, but it means either - a lot of typing 'git pull -r origin refs/heads/master' (if i got it right) - editing config file every time i create a branch (not nice). You can just create the branch as git checkout -b new-branch origin and git will know where to pull from. And you can always do git branch --set-upstream new-branch origin after having created it. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
