{"thread":{"id":"36818","subject":"2.0.0 regression? request pull does not seem to find head","startedAt":"2014-06-02T21:01:31Z","lastAt":"2014-06-04T18:40:33Z","messageCount":6,"participants":["Michael S. Tsirkin","Junio C Hamano","Linus Torvalds","James Spencer"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"243159","messageId":"20140602210131.GA17171@redhat.com","threadId":"36818","inReplyTo":null,"subject":"2.0.0 regression? request pull does not seem to find head","fromName":"Michael S. Tsirkin","fromEmail":"mst@redhat.com","sentAt":"2014-06-02T21:01:31Z","receivedAt":"2014-06-02T21:01:31Z","isPatch":false,"sender":{"key":"mst@kernel.org","avatar":null},"body":"Looks like pull requests no longer work for me on linux.\nSome other trees (non-linux) work fine but I didn't yet\ncheck whether it's the local or the remote tree that's\nat issue.\n\nOr maybe it's a configuration change that I missed?\n\nNote: I have\n[push]\n default = matching\nconfigured in .gitconfig.\n\n[mst@robin linux]$ git request-pull net-next/master git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git net-next\nwarn: No match for commit 2ae76693b8bcabf370b981cd00c36cd41d33fabc found at git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git\nwarn: Are you sure you pushed 'net-next' there?\nThe following changes since commit 96b2e73c5471542cb9c622c4360716684f8797ed:\n\n Revert \"net/mlx4_en: Use affinity hint\" (2014-06-02 00:18:48 -0700)\n\nare available in the git repository at:\n\n git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git net-next\n\nfor you to fetch changes up to 2ae76693b8bcabf370b981cd00c36cd41d33fabc:\n\n vhost: replace rcu with mutex (2014-06-02 23:47:59 +0300)\n\n----------------------------------------------------------------\nMichael S. Tsirkin (2):\n vhost-net: extend device allocation to vmalloc\n vhost: replace rcu with mutex\n\n drivers/vhost/net.c | 23 ++++++++++++++++++-----\n drivers/vhost/vhost.c | 10 +++++++++-\n 2 files changed, 27 insertions(+), 6 deletions(-)\n[mst@robin linux]$ git request-pull net-next/master git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git net-next\nwarn: No match for commit 2ae76693b8bcabf370b981cd00c36cd41d33fabc found at git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git\nwarn: Are you sure you pushed 'net-next' there?\nThe following changes since commit 96b2e73c5471542cb9c622c4360716684f8797ed:\n\n Revert \"net/mlx4_en: Use affinity hint\" (2014-06-02 00:18:48 -0700)\n\nare available in the git repository at:\n\n git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git net-next\n\nfor you to fetch changes up to 2ae76693b8bcabf370b981cd00c36cd41d33fabc:\n\n vhost: replace rcu with mutex (2014-06-02 23:47:59 +0300)\n\n----------------------------------------------------------------\nMichael S. Tsirkin (2):\n vhost-net: extend device allocation to vmalloc\n vhost: replace rcu with mutex\n\n drivers/vhost/net.c | 23 ++++++++++++++++++-----\n drivers/vhost/vhost.c | 10 +++++++++-\n 2 files changed, 27 insertions(+), 6 deletions(-)\n[mst@robin linux]$ git --version\ngit version 2.0.0.538.gb6dd70f\n\n\n\n\n[mst@robin linux]$ /usr/bin/git request-pull net-next/master git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git net-next\nThe following changes since commit 96b2e73c5471542cb9c622c4360716684f8797ed:\n\n Revert \"net/mlx4_en: Use affinity hint\" (2014-06-02 00:18:48 -0700)\n\nare available in the git repository at:\n\n git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-next\n\nfor you to fetch changes up to 2ae76693b8bcabf370b981cd00c36cd41d33fabc:\n\n vhost: replace rcu with mutex (2014-06-02 23:47:59 +0300)\n\n----------------------------------------------------------------\nMichael S. Tsirkin (2):\n vhost-net: extend device allocation to vmalloc\n vhost: replace rcu with mutex\n\n drivers/vhost/net.c | 23 ++++++++++++++++++-----\n drivers/vhost/vhost.c | 10 +++++++++-\n 2 files changed, 27 insertions(+), 6 deletions(-)\n[mst@robin linux]$ /usr/bin/git --version\ngit version 1.8.3.1\n\n\n-- \nMST\n"},{"id":"243161","messageId":"xmqqzjhv2e9u.fsf@gitster.dls.corp.google.com","threadId":"36818","inReplyTo":"20140602210131.GA17171@redhat.com","subject":"Re: 2.0.0 regression? request pull does not seem to find head","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-06-02T21:27:25Z","receivedAt":"2014-06-02T21:27:25Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Michael S. Tsirkin\" writes:\n\n> Looks like pull requests no longer work for me on linux.\n\nWasn't \"does not seem to find head\" was very much deliberate?\n\nLinus's patch wanted the users to explicitly tell the tool, without\ntool trying to be too helpful and risking to guess incorrectly.\n\n> Some other trees (non-linux) work fine but I didn't yet\n> check whether it's the local or the remote tree that's\n> at issue.\n>\n> Or maybe it's a configuration change that I missed?\n>\n> Note: I have\n> [push]\n> default = matching\n> configured in .gitconfig.\n\nThis should not affect anything in request-pull, I think.\n"},{"id":"243164","messageId":"20140602213456.GB17832@redhat.com","threadId":"36818","inReplyTo":"xmqqzjhv2e9u.fsf@gitster.dls.corp.google.com","subject":"Re: 2.0.0 regression? request pull does not seem to find head","fromName":"Michael S. Tsirkin","fromEmail":"mst@redhat.com","sentAt":"2014-06-02T21:34:56Z","receivedAt":"2014-06-02T21:34:56Z","isPatch":false,"sender":{"key":"mst@kernel.org","avatar":null},"body":"On Mon, Jun 02, 2014 at 02:27:25PM -0700, Junio C Hamano wrote:\n> \"Michael S. Tsirkin\" writes:\n> \n> > Looks like pull requests no longer work for me on linux.\n> \n> Wasn't \"does not seem to find head\" was very much deliberate?\n\nI'm sorry I don't understand what you are asking here.\nSame thing happens if I use a branch name explicitly, not just HEAD.\n\n> Linus's patch wanted the users to explicitly tell the tool, without\n> tool trying to be too helpful and risking to guess incorrectly.\n\nSo this is an intentional behaviour change?\nWhich patch do you refer to?\n\n> > Some other trees (non-linux) work fine but I didn't yet\n> > check whether it's the local or the remote tree that's\n> > at issue.\n> >\n> > Or maybe it's a configuration change that I missed?\n> >\n> > Note: I have\n> > [push]\n> > default = matching\n> > configured in .gitconfig.\n> \n> This should not affect anything in request-pull, I think.\n\nI just thought I'd mention this.\npush behaviour is the only big incompatible change I'm aware\nof between 1.8 which works for me and 2.0 which doesn't.\n\n-- \nMST\n"},{"id":"243165","messageId":"CA+55aFyuj=B4jhc9vPkxHotSgJnRXMj_P_QkHCt-TKXtj8tOFQ@mail.gmail.com","threadId":"36818","inReplyTo":"20140602210131.GA17171@redhat.com","subject":"Re: 2.0.0 regression? request pull does not seem to find head","fromName":"Linus Torvalds","fromEmail":"torvalds@linux-foundation.org","sentAt":"2014-06-02T21:36:01Z","receivedAt":"2014-06-02T21:36:01Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"On Mon, Jun 2, 2014 at 2:01 PM, Michael S. Tsirkin wrote:\n>\n> [mst@robin linux]$ git request-pull net-next/master git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git net-next\n> warn: No match for commit 2ae76693b8bcabf370b981cd00c36cd41d33fabc found at git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git\n> warn: Are you sure you pushed 'net-next' there?\n\ngit request-pull is clearly correct. There is no \"net-next\" in that\npublic repository.\n\nIt *used* to be that request-pull then magically tried to fix it up\nfor you, which in turn resulted in the guess not being right, like\npointing to the wrong branch that just happened to have the same SHA1,\nor pointing to a branch when it _should_ have pointed to a tag.\n\nNow, if you pushed your local \"net-next\" branch to another branch name\n(I can find a branch name called \"vhost-next\" at that repository, then\nyou can *tell* git that, using the same syntax you must have used for\nthe push.\n\nSo something like\n\n git request-pull net-next/master\ngit://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git\nnet-next:vhost-next\n\nshould work so that git doesn't end up having to guess (and\npotentially guessing wrong).\n\nBut it may actually be a simpler driver error, and you wanted to use\n\"vhost-next\", and that \"net-next\" was actually incorrect?\n\n Linus\n"},{"id":"243168","messageId":"loom.20140602T235730-544@post.gmane.org","threadId":"36818","inReplyTo":"CA+55aFyuj=B4jhc9vPkxHotSgJnRXMj_P_QkHCt-TKXtj8tOFQ@mail.gmail.com","subject":"Re: 2.0.0 regression? request pull does not seem to find head","fromName":"James Spencer","fromEmail":"james.s.spencer@gmail.com","sentAt":"2014-06-02T22:10:25Z","receivedAt":"2014-06-02T22:10:25Z","isPatch":false,"sender":{"key":"james.s.spencer@gmail.com","avatar":null},"body":"Linus Torvalds linux-foundation.org> writes:\n\n>\n> On Mon, Jun 2, 2014 at 2:01 PM, Michael S. Tsirkin redhat.com>\nwrote:\n> >\n> > [mst robin linux]$ git request-pull net-next/master\n> git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git net-next\n> > warn: No match for commit 2ae76693b8bcabf370b981cd00c36cd41d33fabc found\nat git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git\n> > warn: Are you sure you pushed 'net-next' there?\n>\n> git request-pull is clearly correct. There is no \"net-next\" in that\n> public repository.\n\nI am seeing something similar:\n\n$ git request-pull master origin > /dev/null\nwarn: No match for commit 64ea29197d5e13772b1f7b6c24feaa79cc97d997 found at\norigin\nwarn: Are you sure you pushed 'HEAD' there?\n\nbut I pushed 64ea29197d5e13772b1f7b6c24feaa79cc97d997:\n\n$ git show-ref bug_fix/init_report\n64ea29197d5e13772b1f7b6c24feaa79cc97d997 refs/heads/bug_fix/init_report\n64ea29197d5e13772b1f7b6c24feaa79cc97d997 \nrefs/remotes/origin/bug_fix/init_report\n\nThe warning goes away if I give an explicit end commit.\n\nShould the default value for $remote in the call to $find_matching_ref be\n$head rather than HEAD (and similarly for the warning message)?\n\n --James\n"},{"id":"243315","messageId":"20140604184033.GB11756@redhat.com","threadId":"36818","inReplyTo":"CA+55aFyuj=B4jhc9vPkxHotSgJnRXMj_P_QkHCt-TKXtj8tOFQ@mail.gmail.com","subject":"Re: 2.0.0 regression? request pull does not seem to find head","fromName":"Michael S. Tsirkin","fromEmail":"mst@redhat.com","sentAt":"2014-06-04T18:40:33Z","receivedAt":"2014-06-04T18:40:33Z","isPatch":false,"sender":{"key":"mst@kernel.org","avatar":null},"body":"On Mon, Jun 02, 2014 at 02:36:01PM -0700, Linus Torvalds wrote:\n> On Mon, Jun 2, 2014 at 2:01 PM, Michael S. Tsirkin wrote:\n> >\n> > [mst@robin linux]$ git request-pull net-next/master git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git net-next\n> > warn: No match for commit 2ae76693b8bcabf370b981cd00c36cd41d33fabc found at git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git\n> > warn: Are you sure you pushed 'net-next' there?\n> \n> git request-pull is clearly correct. There is no \"net-next\" in that\n> public repository.\n\nOK, I see that it's correct.\nIt used to match commit and go from there, but it does not anymore, and\nI didn't know this.\n\nHowever, it does not tell me this.\nIt tells me there's no match for commit\n2ae76693b8bcabf370b981cd00c36cd41d33fabc:\nthat commit is there.\nAlso \"match\" implies some matching still going on, might be best\nto drop this.\n\n> It *used* to be that request-pull then magically tried to fix it up\n> for you, which in turn resulted in the guess not being right, like\n> pointing to the wrong branch that just happened to have the same SHA1,\n> or pointing to a branch when it _should_ have pointed to a tag.\n\nWhy not just put the SHA1 in there?\nIn fact it would be a bit more robust in case of\nnon-signed pull requests, won't it?\n\n> Now, if you pushed your local \"net-next\" branch to another branch name\n> (I can find a branch name called \"vhost-next\" at that repository, then\n> you can *tell* git that, using the same syntax you must have used for\n> the push.\n> \n> So something like\n> \n> git request-pull net-next/master\n> git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git\n> net-next:vhost-next\n> \n> should work so that git doesn't end up having to guess (and\n> potentially guessing wrong).\n> \n> But it may actually be a simpler driver error, and you wanted to use\n> \"vhost-next\", and that \"net-next\" was actually incorrect?\n> \n> Linus\n\nYes: net-next is a local name, on the remote it's called vhost-next.\n\n\nI realize now that with\n git request-pull [-p] []\n actually is a name of commit in the *remote*\ntree, not the local one.\nDocumentation could be improved a bit:\n\n Commit to end at (defaults to HEAD). This names the commit at\n\t\tthe tip of the history you are asking to be pulled.\n\n When the repository named by has the commit at a tip of\n\t\ta ref that is different from the ref you have locally, you can use\n the : syntax, to have its local name, a colon\n\t\t:, and its remote name.\n\nIt does not have to be commit (could be signed tag), and\nthat text does not make it very clear what is different from what\nuntil you re-read it a couple of times.\nHow about:\n Object (commit or tag) to end at (defaults to HEAD). This names the object at\n\t\tthe tip of the history you are asking to be pulled.\n\t\tThe name must refer to the same object in both the\n\t\tlocal tree and the remote tree pointed at by .\n\t\n If the object that you want pulled has a different name\n\t in the local and the remote trees, you can use\n the : syntax, to have its local name, a colon\n\t\t:, and its remote name.\n\n\n\nThe error message could be improved too, it asks me whether\nI pushed net-next which I did.\nWould be nicer if it asked \"Pushed net-next to net-next there?\"\n\nAlso, how is it supposed to work without ?\n\n git request-pull net-next/master\ngit://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git\nwarn: No match for commit 2ae76693b8bcabf370b981cd00c36cd41d33fabc found\nat git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git\nwarn: Are you sure you pushed 'HEAD' there?\n\nWhere should I push HEAD, and how?\nIn fact does git let you push to HEAD?\n\n\nFinally, the output even with a warning could be better:\n\ngit request-pull net-next/master\ngit://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git\nwarn: No match for commit 2ae76693b8bcabf370b981cd00c36cd41d33fabc found\nat git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git\nwarn: Are you sure you pushed 'HEAD' there?\nThe following changes since commit\n96b2e73c5471542cb9c622c4360716684f8797ed:\n\n Revert \"net/mlx4_en: Use affinity hint\" (2014-06-02 00:18:48 -0700)\n\nare available in the git repository at:\n\n git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git \n\n\nIf someone does not notice the warning (e.g. the warning is\non stderr and script could only redirect stdout)\nthen pull request is actually wrong.\nIt would be better to find the commit on both sides and\nif it's there, just use the hash name.\n\n\n\n-- \nMST\n"}]}