linux/poky.git/scripts/create-pull-request, branch morty

create-pull-request: remove output directory

2016-09-15T11:15:07+00:00

When 'git request-pull' fails it makes sense to remove output directory. Otherwise create-pull-request will complain that output directory already exists on the next run. (From OE-Core rev: 8535784ba84060e0e7ca05e7771a58f9c70c69b9) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

create-pull-request: set subject automatically for cover latter

2016-08-04T14:22:24+00:00

Set cover letter's subject automatically as the patch's subject when there is only one patch. [YOCTO #9410] (From OE-Core rev: 162b80f8a4670befaf6ffd2c178671cf7370b767) Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

create-pull-request: read remote from env var CPR_CONTRIB_REMOTE

2016-08-04T14:22:23+00:00

So that we don't have specify "-u " everytime, and CPR_CONTRIB_REMOTE can be overrided by -u. [YOCTO #9409] (From OE-Core rev: 81c58fd33e725ce7dba693763646f4c30747bbd5) Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

create-pull-request: add option -a to auto push

2016-08-04T14:22:23+00:00

Before this patch, we need two steps to create PULL: * Step 1, create branch: $ git push : * Step 2, create PULL: $ create-pull-request -u -l -b -r ~ We can see that the args used in step 1 are in step 2, so we can use "create-pull-request -a" or set CPR_CONTRIB_AUTO_PUSH in to create the branch to simplify the steps. [YOCTO #9408] (From OE-Core rev: a569bec9219394703d1c1d9b28dd19bf5b058e7f) Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

create-pull-request: fix for newer git

2016-04-06T21:57:26+00:00

Fixed when git > 2.1.0: $ ./scripts/create-pull-request -r HEAD^ -u contrib -b rbt/git fatal: Not a valid revision: rbt/git ERROR: git request-pull reported an error This is because newer git requires both local and remote branch named as rbt/git, but usually, we only named the remote branch as rbt/foo, and foo for local branch. Add a option '-l' to fix the problem, default is HEAD. (From OE-Core rev: 98faa3ec872e06774b5870fcfb52f3ff91494779) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie

scripts/create-pull-request: fix git request-pull syntax

2016-01-11T23:26:32+00:00

* 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: 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 has the commit at a tip of a ref that is different from the ref you have locally, you can use the : 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 (From OE-Core rev: 2336d1e5de671f538f0cd493b75d29e1dfdb0caf) Signed-off-by: Martin Jansa Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

create-pull-request: handle empty ODIR

2015-12-01T21:32:02+00:00

In some situations you might end-up with an empty ODIR (pull-xx/). The most common reason is that you have applied your patches on 'master' branch (or you are by mistake standing on the 'master' branch), this will result in the default behavior that 'git format-patch' will try to diff master..master. Solve this by aborting the script with a proper error code and message if ODIR is empty after the 'git format-patch' call (that is expected to generate the cover-letter and patches). (From OE-Core rev: 5ef9249bbae4f08eb9b981d10f31bd3348449c82) Signed-off-by: Petter Mabäcker Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

create-pull-request: cleanup bashisms

2015-08-16T08:24:56+00:00

Made create-pull-request POSIX compatible: - Replaced /bin/bash -> /bin/sh in shebang. - Replaced usage of pushd/popd with generic shell commands. - Tested on zsh and dash. (From OE-Core rev: b5c77a94b97b316b7ea075841d18b73e6dccbf2d) Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

create-pull-request: cd to relative directory

2015-08-09T07:14:00+00:00

create-pull-request -d path creates empty patches if directory is specified as a path, i.e. ./bitbake or ./bitbake/ or full path. It behaves expected way only if script is run with -d bitbake, i.e. relative dir name doesn't contain '\'. Fixed this unwanted behaviour by changing directory and running git format-patch in it with --relative, without specifying relative path as a parameter. (From OE-Core rev: 3042956a86167f89beccc5d05f1fad1844e7c36a) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie

create-pull-request: Implement -d option

2015-08-01T06:34:06+00:00

This options allows to generate patches against relative directory by using git format-patch --relative option. See more details about --relative option in git diff manual page. For example generating bitbake patchsets from poky can be done this way: create-pull-request -u contrib -d ./bitbake (From OE-Core rev: 9b544125e1e3d2cc2db8f5d20d6fd0746f8cef5d) Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton Signed-off-by: Richard Purdie