]> code.ossystems Code Review - openembedded-core.git/commit
scripts/create-pull-request: fix git request-pull syntax
authorMartin Jansa <martin.jansa@gmail.com>
Thu, 10 Dec 2015 13:30:43 +0000 (14:30 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 11 Jan 2016 23:23:18 +0000 (23:23 +0000)
commit2336d1e5de671f538f0cd493b75d29e1dfdb0caf
tree22aaec930f52d21c6b6945e76102c6e635b74eb9
parentdfb0832d7b2821ecb99fc543351a414933bc9d89
scripts/create-pull-request: fix git request-pull syntax

* at least with git 2.6.3 I see git request-pull failing
  when there is only :{BRANCH} as ending commit

* $ git request-pull origin/dizzy git://git.openembedded.org/openembedded-core-contrib jansa/dizzy-backports:jansa/dizzy-backports
  The following changes since commit 7bb182bdd130266100fc541fd09b82d09c51cd80:
    build-appliance-image: Update to dizzy head revision (2015-09-29 14:56:04 +0100)
  ...
  And finds correct 7 changes there

* $ git request-pull origin/dizzy git://git.openembedded.org/openembedded-core-contrib :jansa/dizzy-backports
  warn: No match for commit 6068d1c90336ddc1fb32856efd1d9ccf07733896 found at git://git.openembedded.org/openembedded-core-contrib
  warn: Are you sure you pushed 'jansa/dizzy-backports' there?
  The following changes since commit 97756472d3a69eaca95d105494ffea78c6b077e0:
    build-appliance-image: Update to dizzy head revision (2014-10-18 16:16:27 +0200)
  ...
  and lists all commits in _current_ branch since origin/dizzy, then it refuses
  to continue, because there are too many changes.

6068d1c90336ddc1fb32856efd1d9ccf07733896 is this commit in jansa/master-submitted
  branch so it really shouldn't be included in pull request from jansa/dizzy branch.
* git help says:
  <end>
    Commit to end at (defaults to HEAD). This names the commit at the tip of the history you are asking to be pulled.

    When the repository named by <url> has the commit at a tip of a ref that is different from the ref you have locally, you can use
    the <local>:<remote> syntax, to have its local name, a colon :, and its remote name.
* maybe the syntax got changes since git 2.1.0 when Saul added :${BRANCH}
* I haven't found how to respect ${COMMIT_ID in the new syntax

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
scripts/create-pull-request