{"thread":{"id":"31520","subject":"Re: [GIT PULL] sound fixes for 3.6-rc6","startedAt":"2012-09-13T11:51:14Z","lastAt":"2012-09-13T15:26:26Z","messageCount":7,"participants":["Linus Torvalds","Takashi Iwai","Jeff King","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"198908","messageId":"CA+55aFyo6do-dZiZMiwZkN1Ko+W58+4-zkbfJnpQR+ufw=+8ig@mail.gmail.com","threadId":"31520","inReplyTo":"s5h392m1728.wl%tiwai@suse.de","subject":"Re: [GIT PULL] sound fixes for 3.6-rc6","fromName":"Linus Torvalds","fromEmail":"torvalds@linux-foundation.org","sentAt":"2012-09-13T11:51:14Z","receivedAt":"2012-09-13T11:51:14Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"On Thu, Sep 13, 2012 at 7:43 PM, Takashi Iwai wrote:\n> are available in the git repository at:\n>\n> git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus\n\n*PLEASE* don't do this.\n\nYou point to a branch, but then the pull request clearly implies there\nis a tag with extra information in it.\n\nAnd indeed, the actual thing I should pull is not at all \"for-linus\",\nit seems to be your \"tags/sound-3.6\" tag.\n\nI don't know if this is the old \"git pull-request\" breakage where it\nstupidly \"corrects\" the remote branch when it verifies the branch\nname, or whether it's some other scripting problem. I think current\ngit versions should not mess up the tag information, if that's the\ncause, but please verify.\n\n Linus\n"},{"id":"198909","messageId":"s5hzk4uyvsr.wl%tiwai@suse.de","threadId":"31520","inReplyTo":"CA+55aFyo6do-dZiZMiwZkN1Ko+W58+4-zkbfJnpQR+ufw=+8ig@mail.gmail.com","subject":"Re: [GIT PULL] sound fixes for 3.6-rc6","fromName":"Takashi Iwai","fromEmail":"tiwai@suse.de","sentAt":"2012-09-13T12:03:16Z","receivedAt":"2012-09-13T12:03:16Z","isPatch":false,"sender":{"key":"tiwai@suse.de","avatar":"https://avatars.githubusercontent.com/u/306482?v=4"},"body":"At Thu, 13 Sep 2012 19:51:14 +0800,\nLinus Torvalds wrote:\n> \n> On Thu, Sep 13, 2012 at 7:43 PM, Takashi Iwai wrote:\n> > are available in the git repository at:\n> >\n> > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus\n> \n> *PLEASE* don't do this.\n> \n> You point to a branch, but then the pull request clearly implies there\n> is a tag with extra information in it.\n> \n> And indeed, the actual thing I should pull is not at all \"for-linus\",\n> it seems to be your \"tags/sound-3.6\" tag.\n> \n> I don't know if this is the old \"git pull-request\" breakage where it\n> stupidly \"corrects\" the remote branch when it verifies the branch\n> name, or whether it's some other scripting problem. I think current\n> git versions should not mess up the tag information, if that's the\n> cause, but please verify.\n\nOops, yes, it's indeed intended to be tags/sound-3.6.\nSo please pull from:\n git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.6\n\n\nFWIW, it was an output from git-pull-request, which fell back to the\nequivalent branch. Usually I check it manually but I forgot it at\nthis time just before going to a meeting.\n\nThis was with git 1.7.11.5. I'll check whether this still happens\nwith 1.7.12.\n\n\nTakashi\n"},{"id":"198910","messageId":"s5hvcfiyum4.wl%tiwai@suse.de","threadId":"31520","inReplyTo":"s5hzk4uyvsr.wl%tiwai@suse.de","subject":"Re: [GIT PULL] sound fixes for 3.6-rc6","fromName":"Takashi Iwai","fromEmail":"tiwai@suse.de","sentAt":"2012-09-13T12:28:51Z","receivedAt":"2012-09-13T12:28:51Z","isPatch":false,"sender":{"key":"tiwai@suse.de","avatar":"https://avatars.githubusercontent.com/u/306482?v=4"},"body":"At Thu, 13 Sep 2012 14:03:16 +0200,\nTakashi Iwai wrote:\n> \n> At Thu, 13 Sep 2012 19:51:14 +0800,\n> Linus Torvalds wrote:\n> > \n> > On Thu, Sep 13, 2012 at 7:43 PM, Takashi Iwai wrote:\n> > > are available in the git repository at:\n> > >\n> > > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus\n> > \n> > *PLEASE* don't do this.\n> > \n> > You point to a branch, but then the pull request clearly implies there\n> > is a tag with extra information in it.\n> > \n> > And indeed, the actual thing I should pull is not at all \"for-linus\",\n> > it seems to be your \"tags/sound-3.6\" tag.\n> > \n> > I don't know if this is the old \"git pull-request\" breakage where it\n> > stupidly \"corrects\" the remote branch when it verifies the branch\n> > name, or whether it's some other scripting problem. I think current\n> > git versions should not mess up the tag information, if that's the\n> > cause, but please verify.\n> \n> Oops, yes, it's indeed intended to be tags/sound-3.6.\n> So please pull from:\n> git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.6\n> \n> \n> FWIW, it was an output from git-pull-request, which fell back to the\n> equivalent branch. Usually I check it manually but I forgot it at\n> this time just before going to a meeting.\n> \n> This was with git 1.7.11.5. I'll check whether this still happens\n> with 1.7.12.\n\nThe same problem still happens with git 1.7.12.\nThis is rather annoying than useful.\n\n\nTakashi\n"},{"id":"198913","messageId":"20120913130344.GC4287@sigill.intra.peff.net","threadId":"31520","inReplyTo":"s5hvcfiyum4.wl%tiwai@suse.de","subject":"Re: [GIT PULL] sound fixes for 3.6-rc6","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-09-13T13:03:44Z","receivedAt":"2012-09-13T13:03:44Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Sep 13, 2012 at 02:28:51PM +0200, Takashi Iwai wrote:\n\n> > FWIW, it was an output from git-pull-request, which fell back to the\n> > equivalent branch. Usually I check it manually but I forgot it at\n> > this time just before going to a meeting.\n> > \n> > This was with git 1.7.11.5. I'll check whether this still happens\n> > with 1.7.12.\n> \n> The same problem still happens with git 1.7.12.\n> This is rather annoying than useful.\n\nI can't reproduce here. What is your exact request-pull invocation? Is\nrequest-pull showing a warning like:\n\n warn: You locally have sound-3.6 but it does not (yet)\n warn: appear to be at git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git\n warn: Do you want to push it there, perhaps?\n\n(it should do so since v1.7.11.2). Maybe we need to make it possible to\nbump that warning to a fatal error?\n\n-Peff\n"},{"id":"198914","messageId":"s5hligeyrz8.wl%tiwai@suse.de","threadId":"31520","inReplyTo":"20120913130344.GC4287@sigill.intra.peff.net","subject":"Re: [GIT PULL] sound fixes for 3.6-rc6","fromName":"Takashi Iwai","fromEmail":"tiwai@suse.de","sentAt":"2012-09-13T13:25:47Z","receivedAt":"2012-09-13T13:25:47Z","isPatch":false,"sender":{"key":"tiwai@suse.de","avatar":"https://avatars.githubusercontent.com/u/306482?v=4"},"body":"At Thu, 13 Sep 2012 09:03:44 -0400,\nJeff King wrote:\n> \n> On Thu, Sep 13, 2012 at 02:28:51PM +0200, Takashi Iwai wrote:\n> \n> > > FWIW, it was an output from git-pull-request, which fell back to the\n> > > equivalent branch. Usually I check it manually but I forgot it at\n> > > this time just before going to a meeting.\n> > > \n> > > This was with git 1.7.11.5. I'll check whether this still happens\n> > > with 1.7.12.\n> > \n> > The same problem still happens with git 1.7.12.\n> > This is rather annoying than useful.\n> \n> I can't reproduce here. What is your exact request-pull invocation? Is\n> request-pull showing a warning like:\n> \n> warn: You locally have sound-3.6 but it does not (yet)\n> warn: appear to be at git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git\n> warn: Do you want to push it there, perhaps?\n\nHm, it looks like the check is performed only for tag objects.\nIn the example below, no warning appears:\n % git tag mytest for-next\n % git request-pull mytest~ git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git mytest\n\nWith an annotated or a signed tag, git seems giving a warning like\nabove, indeed. So my test seemed wrong. Sorry for the noise.\n\nIn the previous case, I don't know what really screwed up, since it\nwas against a signed tag. Maybe I overlooked the warning as I'm\nredirecting the output to a file.\n\n> (it should do so since v1.7.11.2). Maybe we need to make it possible to\n> bump that warning to a fatal error?\n\nYes, please! It's easily overlooked.\nBetter to be \"strict but correct\" than \"friendly but wrong\".\n\nJust give an option to ignore the error if people really want to\nignore it.\n\n\nthanks,\n\nTakashi\n"},{"id":"198928","messageId":"7vhar29cq4.fsf@alter.siamese.dyndns.org","threadId":"31520","inReplyTo":"s5hligeyrz8.wl%tiwai@suse.de","subject":"Re: [GIT PULL] sound fixes for 3.6-rc6","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-09-13T15:14:27Z","receivedAt":"2012-09-13T15:14:27Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Takashi Iwai writes:\n\n>> I can't reproduce here. What is your exact request-pull invocation?\n\nThis question was not answerd. Did you ask request-pull to ask for\na branch to be pulled, or did you ask it to ask for the tag to be\npulled?\n\nIf the former, I would have say it is a pebcak. Linus asked you to\nask a signed tag to be pulled, and you want to have the tag to be\npulled, but if you do not give \"git request-pull\" the tag but a\nbranch that the tag points at, the command does not have a good\nreason to countermand your (apparent) wish that the branch is what\nis to be pulled.\n\n>> Is request-pull showing a warning like:\n>> \n>> warn: You locally have sound-3.6 but it does not (yet)\n>> warn: appear to be at git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git\n>> warn: Do you want to push it there, perhaps?\n>\n> Hm, it looks like the check is performed only for tag objects.\n> In the example below, no warning appears:\n> % git tag mytest for-next\n> % git request-pull mytest~ git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git mytest\n>\n> With an annotated or a signed tag, git seems giving a warning like\n> above, indeed. So my test seemed wrong. Sorry for the noise.\n\nOK.\n"},{"id":"198930","messageId":"s5h7gry2bbx.wl%tiwai@suse.de","threadId":"31520","inReplyTo":"7vhar29cq4.fsf@alter.siamese.dyndns.org","subject":"Re: [GIT PULL] sound fixes for 3.6-rc6","fromName":"Takashi Iwai","fromEmail":"tiwai@suse.de","sentAt":"2012-09-13T15:26:26Z","receivedAt":"2012-09-13T15:26:26Z","isPatch":false,"sender":{"key":"tiwai@suse.de","avatar":"https://avatars.githubusercontent.com/u/306482?v=4"},"body":"At Thu, 13 Sep 2012 08:14:27 -0700,\nJunio C Hamano wrote:\n> \n> Takashi Iwai writes:\n> \n> >> I can't reproduce here. What is your exact request-pull invocation?\n> \n> This question was not answerd.\n\nIt was (a sort of), but let me clarify again.\nIn my original pull request, I did git-request-pull for a signed tag,\nbut I apparently overlooked the warning.\nThen the next test with git 1.7.12, I did it using no annotated/signed\ntag, so git-request-pull didn't complain it. When I do it with a\nsigned tag, it starts warning.\n\n> Did you ask request-pull to ask for\n> a branch to be pulled, or did you ask it to ask for the tag to be\n> pulled?\n> \n> If the former, I would have say it is a pebcak. Linus asked you to\n> ask a signed tag to be pulled, and you want to have the tag to be\n> pulled, but if you do not give \"git request-pull\" the tag but a\n> branch that the tag points at, the command does not have a good\n> reason to countermand your (apparent) wish that the branch is what\n> is to be pulled.\n\nYeah I can understand that. But the problem is that a warning is\nmoderate so it can be so easily overlooked. It'd be user- (or\nsubsystem-maintainer-) friendly if this automatic conversion can be\nsuppressed.\n\n\nTakashi\n\n> >> Is request-pull showing a warning like:\n> >> \n> >> warn: You locally have sound-3.6 but it does not (yet)\n> >> warn: appear to be at git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git\n> >> warn: Do you want to push it there, perhaps?\n> >\n> > Hm, it looks like the check is performed only for tag objects.\n> > In the example below, no warning appears:\n> > % git tag mytest for-next\n> > % git request-pull mytest~ git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git mytest\n> >\n> > With an annotated or a signed tag, git seems giving a warning like\n> > above, indeed. So my test seemed wrong. Sorry for the noise.\n> \n> OK.\n> \n"}]}