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

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

Revert "create-pull-request: Fix error on 2.0 versions of git"

2015-07-21T22:53:45+00:00

This breaks create-pull-request for git <2, which is many people. This reverts commit 7ee64ea60ede5477b2f9a355d93bdc556e6b7895. (From OE-Core rev: 26766ea8ee0ef121e54ff9084c4637aa8df984f4) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

create-pull-request: Fix error on 2.0 versions of git

2015-07-16T14:09:21+00:00

On 2.0 versions of git, the create-pull-request script exits with the warning "No match for commit... Are you sure you pushed 'HEAD' there?". This is due to a change in behavior where git used to guess the branch you meant, but no longer does. See the thread at http://www.spinics.net/lists/git/msg233050.html for more information. To accommodate the new behavior, if the COMMIT_ID is set to the default of "HEAD", make it point explicitly to $BRANCH instead. (From OE-Core rev: 7ee64ea60ede5477b2f9a355d93bdc556e6b7895) Signed-off-by: Ben Shelton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

create-pull-request: fix git GIT_VERSION

2015-03-10T10:47:46+00:00

If the git version is 1.7.9.5, then 1795 is bigger than 210 which causes errors like: fatal: No such ref: :rbt/bash fatal: Needed a single revision ERROR: git request-pull reported an error Use the first 3 numbers to fix the problem. (From OE-Core rev: d23a1d7df849a2a7d338b2805bba7694717cbe65) Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

create-pull-request: Fix git request-pull

2015-02-08T08:00:25+00:00

(From OE-Core rev: 5ffa98a95317e6bea436e4372b9202f4da0ce2ae) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie

create-pull-request: Error message on missing -u

2013-02-08T14:50:36+00:00

The script was erroring out without a hint on what failed. (From OE-Core rev: 72266cfa3a12a19a94d9176ecca9d080658dbf2e) Signed-off-by: Bernhard Reutner-Fischer Signed-off-by: Saul Wold Signed-off-by: Richard Purdie

create-pull-request: detect trailing white space

2012-12-13T15:18:44+00:00

Add logic in the create-pull-request to detect and warn about the trailing white space inserted by patches. (From OE-Core rev: 3e35310db3cd6d265092724a0e542b9616aca9c5) Signed-off-by: Nitin A Kamble Signed-off-by: Saul Wold Signed-off-by: Richard Purdie