summaryrefslogtreecommitdiffstats
path: root/scripts/create-pull-request
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2015-02-03 09:08:29 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-08 08:00:25 +0000
commitdbfed41b76fa4ef7774882c9e121917a58f84a41 (patch)
treec6cd6129b1cf6fba245f985bc5d23c9388e29307 /scripts/create-pull-request
parent5a4e20a73f1aac2d94900ab84e9a33b93ead904c (diff)
downloadpoky-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-xscripts/create-pull-request8
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
179CL="$ODIR/0000-cover-letter.patch" 179CL="$ODIR/0000-cover-letter.patch"
180PM="$ODIR/pull-msg" 180PM="$ODIR/pull-msg"
181git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID >> "$PM" 181GIT_VERSION=$(`git --version` | tr -d '[:alpha:][:space:].')
182NEWER_GIT_VERSION=210
183if [ $GIT_VERSION -lt $NEWER_GIT_VERSION ]; then
184 git request-pull $RELATIVE_TO $REMOTE_URL $COMMIT_ID >> "$PM"
185else
186 git request-pull $RELATIVE_TO $REMOTE_URL :$BRANCH >> "$PM"
187fi
182if [ $? -ne 0 ]; then 188if [ $? -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