On Thu, Sep 13, 2012 at 7:43 PM, Takashi Iwai [off-list ref] 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
At Thu, 13 Sep 2012 19:51:14 +0800,
Linus Torvalds wrote:
On Thu, Sep 13, 2012 at 7:43 PM, Takashi Iwai [off-list ref] wrote:
quoted
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
At Thu, 13 Sep 2012 14:03:16 +0200,
Takashi Iwai wrote:
At Thu, 13 Sep 2012 19:51:14 +0800,
Linus Torvalds wrote:
quoted
On Thu, Sep 13, 2012 at 7:43 PM, Takashi Iwai [off-list ref] wrote:
quoted
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
From: Jeff King <hidden> Date: 2012-09-13 13:10:28
On Thu, Sep 13, 2012 at 02:28:51PM +0200, Takashi Iwai wrote:
quoted
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
At Thu, 13 Sep 2012 09:03:44 -0400,
Jeff King wrote:
On Thu, Sep 13, 2012 at 02:28:51PM +0200, Takashi Iwai wrote:
quoted
quoted
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