Paolo Bonzini <bonz...@gnu.org> writes:
> On 16/02/2015 20:47, Junio C Hamano wrote:
>> Paolo Bonzini <bonz...@gnu.org> writes:
>>
>>> From: Paolo Bonzini <pbonz...@redhat.com>
>>>
>>> After updating to git 2.3.0, "git request-pull" is stubbornly complaining
>>> that I lack a matching tag on the remote side unless I pass the third
>>> argument. But I did prepare and push a signed tag.
>>
>> A few questions.
>>
>> - what old version did you update from? I think the "correct
>> over-eager dwimming" change was from v2.0 days.
>
> I upgraded from 1.9. My workflow is to make a signed tag, push it and
> do "git request-pull origin/master <url>".
>
> My branches have a different name locally vs. remotely (e.g.
> "kvm-master" and "kvm-next" locally vs. refs/heads/master and
> refs/heads/next remotely) exactly to avoid overeager matching in
> git-request-pull. I only ever want to request pulls based on signed tags.
So I think you would want something like this:
git tag -s for-linus kvm-next
git push <url> kvm-next:next tags/for-linus
git request-pull origin/master <url> for-linus
in the post 2.0 world with 024d34cb (request-pull: more strictly
match local/remote branches, 2014-01-22)?
>> - what exactly do you mean by "stubbornly complain"? I think we
>> say something about HEAD not matching the HEAD over there, which
>> I think is bogus (we should instead say things about the branch
>> you are on and the branch over there with the same name) and is
>> worth fixing.
>
> I tried both "git checkout kvm-next" and "git checkout tags/for-linus",
> and it still complains.
Sorry, I was asking what you mean by "complains" (i.e. the exact
error message). I was and am guessing it is something like this:
warn: No match for commit 3188ab3... found at <url>
warn: Are you sure you pushed 'HEAD' there?
Asking to pull 'HEAD' may be often a wrong thing to do, and I
wouldn't mind if this sequence:
git checkout kvm-next
git request-pull origin/master <url>
behaved the same way as
git request-pull origin/master <url> kvm-next
But I do not know if the implicit HEAD should DWIM locally to this:
git request-pull origin/master <url> for-linus
> ... Based on your answer, it seems like you are focusing mostly
> on a branch-based workflow; ...
Not really. I am focusing mostly on not breaking what 024d34cb0 and
dc2eacc58c fixed earlier.
> ... the two definitely have
> different requirements for DWIMming (since you cannot get a tag name via
> "git symbolic-ref" for example). On the other hand most of the
> un-DWIMming changes were done by Linus who works a lot with (other
> people's) signed tags...
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
