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 | 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 503248bbf0..d83362f7f4 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 -- | |||
178 | # Customize the cover letter | 178 | # Customize the cover letter |
179 | CL="$ODIR/0000-cover-letter.patch" | 179 | CL="$ODIR/0000-cover-letter.patch" |
180 | PM="$ODIR/pull-msg" | 180 | PM="$ODIR/pull-msg" |
181 | git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID >> "$PM" | 181 | GIT_VERSION=$(`git --version` | tr -d '[:alpha:][:space:].') |
182 | NEWER_GIT_VERSION=210 | ||
183 | if [ $GIT_VERSION -lt $NEWER_GIT_VERSION ]; then | ||
184 | git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID >> "$PM" | ||
185 | else | ||
186 | git request-pull $RELATIVE_TO $REMOTE_URL :$BRANCH >> "$PM" | ||
187 | fi | ||
182 | if [ $? -ne 0 ]; then | 188 | if [ $? -ne 0 ]; then |
183 | echo "ERROR: git request-pull reported an error" | 189 | echo "ERROR: git request-pull reported an error" |
184 | exit 1 | 190 | exit 1 |