diff options
| author | Saul Wold <sgw@linux.intel.com> | 2015-02-03 09:08:29 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-08 08:00:25 +0000 |
| commit | dbfed41b76fa4ef7774882c9e121917a58f84a41 (patch) | |
| tree | c6cd6129b1cf6fba245f985bc5d23c9388e29307 /scripts/create-pull-request | |
| parent | 5a4e20a73f1aac2d94900ab84e9a33b93ead904c (diff) | |
| download | ast2050-yocto-poky-dbfed41b76fa4ef7774882c9e121917a58f84a41.zip ast2050-yocto-poky-dbfed41b76fa4ef7774882c9e121917a58f84a41.tar.gz | |
create-pull-request: Fix git request-pull
(From OE-Core rev: 5ffa98a95317e6bea436e4372b9202f4da0ce2ae)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/create-pull-request')
| -rwxr-xr-x | scripts/create-pull-request | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 503248b..d83362f 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -178,7 +178,13 @@ git format-patch -M40 --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow -- # Customize the cover letter CL="$ODIR/0000-cover-letter.patch" PM="$ODIR/pull-msg" -git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID >> "$PM" +GIT_VERSION=$(`git --version` | tr -d '[:alpha:][:space:].') +NEWER_GIT_VERSION=210 +if [ $GIT_VERSION -lt $NEWER_GIT_VERSION ]; then + git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID >> "$PM" +else + git request-pull $RELATIVE_TO $REMOTE_URL :$BRANCH >> "$PM" +fi if [ $? -ne 0 ]; then echo "ERROR: git request-pull reported an error" exit 1 |
