{"thread":{"id":"8893","subject":"Cherry-picking to remote branches","startedAt":"2007-07-06T14:09:26Z","lastAt":"2007-07-07T13:00:25Z","messageCount":6,"participants":["Sean Kelley","Johannes Schindelin","VMiklos"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"46623","messageId":"a2e879e50707060709oc9fe8b3k8e594f1cb6e10437@mail.gmail.com","threadId":"8893","inReplyTo":null,"subject":"Cherry-picking to remote branches","fromName":"Sean Kelley","fromEmail":"svk.sweng@gmail.com","sentAt":"2007-07-06T14:09:26Z","receivedAt":"2007-07-06T14:09:26Z","isPatch":false,"sender":{"key":"svk.sweng@gmail.com","avatar":null},"body":"I have been having trouble with the following workflow. I am trying\nto push changes to a remote from a branch that is tracking it.\n\ngit clone git://mysite.com/data/git/linux-devel.git linux-devel\n\ncd linux-devel\n\ngit remote add -m master -f linux-stable\ngit://mysite.com/data/git/linux-stable.git\n\ngit branch -r\n\n linux-stable/HEAD\n linux-stable/master\n origin/HEAD\n origin/master\n\ngit checkout -b stable linux-stable/master\n\ngit cherry-pick b3b1eea69a (a commit from linux-devel)\n\ngit push linux-stable\n\nerror: remote 'refs/heads/master' is not a strict subset of local ref\n'refs/heads/master'. maybe you are not up-to-date and need to pull\nfirst?\nerror: failed to push to 'git://mysite.com/data/git/linux-stable.git'\n\nThanks for your help,\n\nSean\n"},{"id":"46624","messageId":"Pine.LNX.4.64.0707061524180.4093@racer.site","threadId":"8893","inReplyTo":"a2e879e50707060709oc9fe8b3k8e594f1cb6e10437@mail.gmail.com","subject":"Re: Cherry-picking to remote branches","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-07-06T14:26:00Z","receivedAt":"2007-07-06T14:26:00Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 6 Jul 2007, Sean Kelley wrote:\n\n> [...]\n>\n> git checkout -b stable linux-stable/master\n> \n> git cherry-pick b3b1eea69a (a commit from linux-devel)\n> \n> git push linux-stable\n> \n> error: remote 'refs/heads/master' is not a strict subset of local ref\n> 'refs/heads/master'. maybe you are not up-to-date and need to pull\n> first?\n> error: failed to push to 'git://mysite.com/data/git/linux-stable.git'\n\nSince you are obviously only interested in pushing the stable branch, why \ndon't you\n\n\tgit push linux-stable stable\n\nHm?\n\nIf you do not specify which branches to push, \"git push\" will find all \nrefnames which are present both locally and remotely, and push those. \nEvidently, however, your local \"master\" disagrees with the remote \n\"master\".\n\nHth,\nDscho\n"},{"id":"46625","messageId":"a2e879e50707060739s4c8e751dj494618d3d545277b@mail.gmail.com","threadId":"8893","inReplyTo":"Pine.LNX.4.64.0707061524180.4093@racer.site","subject":"Re: Cherry-picking to remote branches","fromName":"Sean Kelley","fromEmail":"svk.sweng@gmail.com","sentAt":"2007-07-06T14:39:47Z","receivedAt":"2007-07-06T14:39:47Z","isPatch":false,"sender":{"key":"svk.sweng@gmail.com","avatar":null},"body":"Hi\n\nOn 7/6/07, Johannes Schindelin wrote:\n> Hi,\n>\n> On Fri, 6 Jul 2007, Sean Kelley wrote:\n>\n> > [...]\n> >\n> > git checkout -b stable linux-stable/master\n> >\n> > git cherry-pick b3b1eea69a (a commit from linux-devel)\n> >\n> > git push linux-stable\n> >\n> > error: remote 'refs/heads/master' is not a strict subset of local ref\n> > 'refs/heads/master'. maybe you are not up-to-date and need to pull\n> > first?\n> > error: failed to push to 'git://mysite.com/data/git/linux-stable.git'\n>\n> Since you are obviously only interested in pushing the stable branch, why\n> don't you\n>\n> git push linux-stable stable\n>\n> Hm?\n>\n> If you do not specify which branches to push, \"git push\" will find all\n> refnames which are present both locally and remotely, and push those.\n> Evidently, however, your local \"master\" disagrees with the remote\n> \"master\".\n\nIt is not entirely clear to me from the documentation. So I was\ntrying to cobble together something that seemed to make sense. I want\nto work from the devel clone. On occasion I want to cherry-pick\nchangesets and push those to the stable branch. I don't want\neverything that goes into devel to go into stable.\n\nSean\n>\n> Hth,\n> Dscho\n>\n>\n"},{"id":"46630","messageId":"20070706150155.GV32766@genesis.frugalware.org","threadId":"8893","inReplyTo":"a2e879e50707060739s4c8e751dj494618d3d545277b@mail.gmail.com","subject":"Re: Cherry-picking to remote branches","fromName":"VMiklos","fromEmail":"vmiklos@frugalware.org","sentAt":"2007-07-06T15:01:55Z","receivedAt":"2007-07-06T15:01:55Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"Na Fri, Jul 06, 2007 at 09:39:47AM -0500, Sean Kelley pisal(a):\n>> > git checkout -b stable linux-stable/master\n>> >\n>> > git cherry-pick b3b1eea69a (a commit from linux-devel)\n>> >\n>> > git push linux-stable\n>> >\n>> > error: remote 'refs/heads/master' is not a strict subset of local ref\n>> > 'refs/heads/master'. maybe you are not up-to-date and need to pull\n>> > first?\n>> > error: failed to push to 'git://mysite.com/data/git/linux-stable.git'\n>>\n>> Since you are obviously only interested in pushing the stable branch, why\n>> don't you\n>>\n>> git push linux-stable stable\n>>\n>> Hm?\n>>\n>> If you do not specify which branches to push, \"git push\" will find all\n>> refnames which are present both locally and remotely, and push those.\n>> Evidently, however, your local \"master\" disagrees with the remote\n>> \"master\".\n>\n> It is not entirely clear to me from the documentation. So I was\n> trying to cobble together something that seemed to make sense. I want\n> to work from the devel clone. On occasion I want to cherry-pick\n> changesets and push those to the stable branch. I don't want\n> everything that goes into devel to go into stable.\n\nwhat about this?\n\n git push linux-stable stable:master\n\nVMiklos\n\n-- \ndeveloper of Frugalware Linux - http://frugalware.org\n"},{"id":"46633","messageId":"a2e879e50707060810v6b3f0a9ctda4f3fa12c284e0e@mail.gmail.com","threadId":"8893","inReplyTo":"20070706150155.GV32766@genesis.frugalware.org","subject":"Re: Cherry-picking to remote branches","fromName":"Sean Kelley","fromEmail":"svk.sweng@gmail.com","sentAt":"2007-07-06T15:10:00Z","receivedAt":"2007-07-06T15:10:00Z","isPatch":false,"sender":{"key":"svk.sweng@gmail.com","avatar":null},"body":"Hi,\n\nOn 7/6/07, VMiklos wrote:\n> Na Fri, Jul 06, 2007 at 09:39:47AM -0500, Sean Kelley pisal(a):\n> >> > git checkout -b stable linux-stable/master\n> >> >\n> >> > git cherry-pick b3b1eea69a (a commit from linux-devel)\n> >> >\n> >> > git push linux-stable\n> >> >\n> >> > error: remote 'refs/heads/master' is not a strict subset of local ref\n> >> > 'refs/heads/master'. maybe you are not up-to-date and need to pull\n> >> > first?\n> >> > error: failed to push to 'git://mysite.com/data/git/linux-stable.git'\n> >>\n> >> Since you are obviously only interested in pushing the stable branch, why\n> >> don't you\n> >>\n> >> git push linux-stable stable\n> >>\n> >> Hm?\n> >>\n> >> If you do not specify which branches to push, \"git push\" will find all\n> >> refnames which are present both locally and remotely, and push those.\n> >> Evidently, however, your local \"master\" disagrees with the remote\n> >> \"master\".\n> >\n> > It is not entirely clear to me from the documentation. So I was\n> > trying to cobble together something that seemed to make sense. I want\n> > to work from the devel clone. On occasion I want to cherry-pick\n> > changesets and push those to the stable branch. I don't want\n> > everything that goes into devel to go into stable.\n>\n> what about this?\n>\n> git push linux-stable stable:master\n\nThat creates a new head on my remote server. Where as I wanted to\npush to the remotes head.\n\nSean\n>\n> VMiklos\n>\n> --\n> developer of Frugalware Linux - http://frugalware.org\n>\n>\n"},{"id":"46687","messageId":"a2e879e50707070600qc89b4dey4847d7bb6d01e1e5@mail.gmail.com","threadId":"8893","inReplyTo":"a2e879e50707060709oc9fe8b3k8e594f1cb6e10437@mail.gmail.com","subject":"Re: Cherry-picking to remote branches","fromName":"Sean Kelley","fromEmail":"svk.sweng@gmail.com","sentAt":"2007-07-07T13:00:25Z","receivedAt":"2007-07-07T13:00:25Z","isPatch":false,"sender":{"key":"svk.sweng@gmail.com","avatar":null},"body":"On 7/6/07, Sean Kelley wrote:\n> I have been having trouble with the following workflow. I am trying\n> to push changes to a remote from a branch that is tracking it.\n\n\nIs there a better way to do this? Basically I want to push from the\nbranch to the remote. But it doesn't seem to work at least without\npushing the branch itself as a new head to the remote. Perhaps the\nbetter way to do it is to have two different directories:\n\n1) clone the linux-devel.git and have a read-only remote to\nlinux-stable to fetch changes and cherry-pick.\n2) clone the linux-stable.git and have a read-only remote to\nlinux-devel to fetch changes and cherry-pick\n\nSo you would just cd to the specific one you want to work with.\n\nSean\n>\n> git clone git://mysite.com/data/git/linux-devel.git linux-devel\n>\n> cd linux-devel\n>\n> git remote add -m master -f linux-stable\n> git://mysite.com/data/git/linux-stable.git\n>\n> git branch -r\n>\n> linux-stable/HEAD\n> linux-stable/master\n> origin/HEAD\n> origin/master\n>\n> git checkout -b stable linux-stable/master\n>\n> git cherry-pick b3b1eea69a (a commit from linux-devel)\n>\n> git push linux-stable\n>\n> error: remote 'refs/heads/master' is not a strict subset of local ref\n> 'refs/heads/master'. maybe you are not up-to-date and need to pull\n> first?\n> error: failed to push to 'git://mysite.com/data/git/linux-stable.git'\n>\n> Thanks for your help,\n>\n>\n> Sean\n>\n"}]}