threads / discuss / 31520

Re: [GIT PULL] sound fixes for 3.6-rc6

Subject: Re: [GIT PULL] sound fixes for 3.6-rc6

## tl;dr

7 messages between Sep 13, 2012 and Sep 13, 2012.

replies: 6people: 4as markdown or json

Linus Torvalds· Sep 13, 2012, 11:51 UTC · lore

On Thu, Sep 13, 2012 at 7:43 PM, Takashi Iwai <tiwai@suse.de> wrote:

> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus

*PLEASE* don't do this.

You point to a branch, but then the pull request clearly implies there is a tag with extra information in it.

And indeed, the actual thing I should pull is not at all "for-linus", it seems to be your "tags/sound-3.6" tag.

I don't know if this is the old "git pull-request" breakage where it stupidly "corrects" the remote branch when it verifies the branch name, or whether it's some other scripting problem. I think current git versions should not mess up the tag information, if that's the cause, but please verify.

            Linus

Takashi Iwai· Sep 13, 2012, 12:03 UTC · re: Linus Torvalds · lore

At Thu, 13 Sep 2012 19:51:14 +0800, Linus Torvalds wrote:

Show 19 quoted lines

> 
> On Thu, Sep 13, 2012 at 7:43 PM, Takashi Iwai <tiwai@suse.de> wrote:
> > are available in the git repository at:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus
> 
> *PLEASE* don't do this.
> 
> You point to a branch, but then the pull request clearly implies there
> is a tag with extra information in it.
> 
> And indeed, the actual thing I should pull is not at all "for-linus",
> it seems to be your "tags/sound-3.6" tag.
> 
> I don't know if this is the old "git pull-request" breakage where it
> stupidly "corrects" the remote branch when it verifies the branch
> name, or whether it's some other scripting problem. I think current
> git versions should not mess up the tag information, if that's the
> cause, but please verify.

Oops, yes, it's indeed intended to be tags/sound-3.6.
So please pull from:
  git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.6

FWIW, it was an output from git-pull-request, which fell back to the equivalent branch. Usually I check it manually but I forgot it at this time just before going to a meeting.

This was with git 1.7.11.5. I'll check whether this still happens with 1.7.12.

Takashi

Takashi Iwai· Sep 13, 2012, 12:28 UTC · re: Takashi Iwai · lore

At Thu, 13 Sep 2012 14:03:16 +0200, Takashi Iwai wrote:

Show 34 quoted lines

> 
> At Thu, 13 Sep 2012 19:51:14 +0800,
> Linus Torvalds wrote:
> > 
> > On Thu, Sep 13, 2012 at 7:43 PM, Takashi Iwai <tiwai@suse.de> wrote:
> > > are available in the git repository at:
> > >
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus
> > 
> > *PLEASE* don't do this.
> > 
> > You point to a branch, but then the pull request clearly implies there
> > is a tag with extra information in it.
> > 
> > And indeed, the actual thing I should pull is not at all "for-linus",
> > it seems to be your "tags/sound-3.6" tag.
> > 
> > I don't know if this is the old "git pull-request" breakage where it
> > stupidly "corrects" the remote branch when it verifies the branch
> > name, or whether it's some other scripting problem. I think current
> > git versions should not mess up the tag information, if that's the
> > cause, but please verify.
> 
> Oops, yes, it's indeed intended to be tags/sound-3.6.
> So please pull from:
>   git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.6
> 
> 
> FWIW, it was an output from git-pull-request, which fell back to the
> equivalent branch.  Usually I check it manually but I forgot it at
> this time just before going to a meeting.
> 
> This was with git 1.7.11.5.  I'll check whether this still happens
> with 1.7.12.

The same problem still happens with git 1.7.12. This is rather annoying than useful.

Takashi

Jeff King· Sep 13, 2012, 13:03 UTC · re: Takashi Iwai · lore

On Thu, Sep 13, 2012 at 02:28:51PM +0200, Takashi Iwai wrote:

Show 9 quoted lines

> > FWIW, it was an output from git-pull-request, which fell back to the
> > equivalent branch.  Usually I check it manually but I forgot it at
> > this time just before going to a meeting.
> > 
> > This was with git 1.7.11.5.  I'll check whether this still happens
> > with 1.7.12.
> 
> The same problem still happens with git 1.7.12.
> This is rather annoying than useful.

I can't reproduce here. What is your exact request-pull invocation? Is request-pull showing a warning like:

  warn: You locally have sound-3.6 but it does not (yet)
  warn: appear to be at git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  warn: Do you want to push it there, perhaps?

(it should do so since v1.7.11.2). Maybe we need to make it possible to bump that warning to a fatal error?

-Peff

Takashi Iwai· Sep 13, 2012, 13:25 UTC · re: Jeff King · lore

At Thu, 13 Sep 2012 09:03:44 -0400, Jeff King wrote:

Show 19 quoted lines

> 
> On Thu, Sep 13, 2012 at 02:28:51PM +0200, Takashi Iwai wrote:
> 
> > > FWIW, it was an output from git-pull-request, which fell back to the
> > > equivalent branch.  Usually I check it manually but I forgot it at
> > > this time just before going to a meeting.
> > > 
> > > This was with git 1.7.11.5.  I'll check whether this still happens
> > > with 1.7.12.
> > 
> > The same problem still happens with git 1.7.12.
> > This is rather annoying than useful.
> 
> I can't reproduce here. What is your exact request-pull invocation? Is
> request-pull showing a warning like:
> 
>   warn: You locally have sound-3.6 but it does not (yet)
>   warn: appear to be at git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
>   warn: Do you want to push it there, perhaps?

Hm, it looks like the check is performed only for tag objects.
In the example below, no warning appears:
    % git tag mytest for-next
    % git request-pull mytest~ git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git mytest

With an annotated or a signed tag, git seems giving a warning like above, indeed. So my test seemed wrong. Sorry for the noise.

In the previous case, I don't know what really screwed up, since it was against a signed tag. Maybe I overlooked the warning as I'm redirecting the output to a file.

> (it should do so since v1.7.11.2). Maybe we need to make it possible to
> bump that warning to a fatal error?

Yes, please! It's easily overlooked. Better to be "strict but correct" than "friendly but wrong".

Just give an option to ignore the error if people really want to ignore it.

thanks,

Takashi

Junio C Hamano· Sep 13, 2012, 15:14 UTC · re: Takashi Iwai · lore

Takashi Iwai <tiwai@suse.de> writes:

>> I can't reproduce here. What is your exact request-pull invocation?

This question was not answerd. Did you ask request-pull to ask for a branch to be pulled, or did you ask it to ask for the tag to be pulled?

If the former, I would have say it is a pebcak. Linus asked you to ask a signed tag to be pulled, and you want to have the tag to be pulled, but if you do not give "git request-pull" the tag but a branch that the tag points at, the command does not have a good reason to countermand your (apparent) wish that the branch is what is to be pulled.

Show 13 quoted lines

>> Is request-pull showing a warning like:
>> 
>>   warn: You locally have sound-3.6 but it does not (yet)
>>   warn: appear to be at git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
>>   warn: Do you want to push it there, perhaps?
>
> Hm, it looks like the check is performed only for tag objects.
> In the example below, no warning appears:
>     % git tag mytest for-next
>     % git request-pull mytest~ git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git mytest
>
> With an annotated or a signed tag, git seems giving a warning like
> above, indeed.  So my test seemed wrong.  Sorry for the noise.

OK.

Takashi Iwai· Sep 13, 2012, 15:26 UTC · re: Junio C Hamano · lore

At Thu, 13 Sep 2012 08:14:27 -0700, Junio C Hamano wrote:

Show 6 quoted lines

> 
> Takashi Iwai <tiwai@suse.de> writes:
> 
> >> I can't reproduce here. What is your exact request-pull invocation?
> 
> This question was not answerd.

It was (a sort of), but let me clarify again. In my original pull request, I did git-request-pull for a signed tag, but I apparently overlooked the warning. Then the next test with git 1.7.12, I did it using no annotated/signed tag, so git-request-pull didn't complain it. When I do it with a signed tag, it starts warning.

Show 10 quoted lines

>  Did you ask request-pull to ask for
> a branch to be pulled, or did you ask it to ask for the tag to be
> pulled?
> 
> If the former, I would have say it is a pebcak.  Linus asked you to
> ask a signed tag to be pulled, and you want to have the tag to be
> pulled, but if you do not give "git request-pull" the tag but a
> branch that the tag points at, the command does not have a good
> reason to countermand your (apparent) wish that the branch is what
> is to be pulled.

Yeah I can understand that. But the problem is that a warning is moderate so it can be so easily overlooked. It'd be user- (or subsystem-maintainer-) friendly if this automatic conversion can be suppressed.

Takashi

Show 16 quoted lines

> >> Is request-pull showing a warning like:
> >> 
> >>   warn: You locally have sound-3.6 but it does not (yet)
> >>   warn: appear to be at git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
> >>   warn: Do you want to push it there, perhaps?
> >
> > Hm, it looks like the check is performed only for tag objects.
> > In the example below, no warning appears:
> >     % git tag mytest for-next
> >     % git request-pull mytest~ git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git mytest
> >
> > With an annotated or a signed tag, git seems giving a warning like
> > above, indeed.  So my test seemed wrong.  Sorry for the noise.
> 
> OK.
>