From: Junio C Hamano <gitster@pobox.com>
To: Paolo Bonzini <bonzini@gnu.org>
Cc: git@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH 0/3] request-pull: do something if $3 is passed
Date: Tue, 17 Feb 2015 11:57:20 -0800 [thread overview]
Message-ID: <xmqqvbj01fbz.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <54E31405.5040502@gnu.org> (Paolo Bonzini's message of "Tue, 17 Feb 2015 11:12:21 +0100")
Paolo Bonzini <bonzini@gnu.org> writes:
> On 16/02/2015 20:47, Junio C Hamano wrote:
>> Paolo Bonzini <bonzini@gnu.org> writes:
>>
>>> From: Paolo Bonzini <pbonzini@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...
next prev parent reply other threads:[~2015-02-17 19:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-16 18:16 [PATCH 0/3] request-pull: do something if $3 is passed Paolo Bonzini
2015-02-16 18:16 ` [PATCH 1/3] request-pull: fix expected format in tests Paolo Bonzini
2015-02-16 18:16 ` [PATCH 2/3] request-pull: use "git tag --points-at" to detect local tags Paolo Bonzini
2015-02-16 18:16 ` [PATCH 3/3] request-pull: find matching tag or branch name on remote side Paolo Bonzini
2015-02-16 19:47 ` [PATCH 0/3] request-pull: do something if $3 is passed Junio C Hamano
2015-02-17 10:12 ` Paolo Bonzini
2015-02-17 19:57 ` Junio C Hamano [this message]
2015-02-17 20:34 ` Paolo Bonzini
2015-02-17 20:42 ` Linus Torvalds
2015-02-17 20:53 ` Paolo Bonzini
2015-02-17 21:04 ` Linus Torvalds
2015-02-17 21:10 ` Paolo Bonzini
2015-02-17 21:18 ` Linus Torvalds
2015-02-18 7:11 ` Junio C Hamano
2015-02-17 21:03 ` Junio C Hamano
2015-02-17 21:08 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqvbj01fbz.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=bonzini@gnu.org \
--cc=git@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).