[OE-core] [PATCH 6/6] create-pull-request: Fix git request-pull
Saul Wold
sgw at linux.intel.com
Tue Feb 3 18:34:32 UTC 2015
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
scripts/create-pull-request | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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
--
2.1.0
More information about the Openembedded-core
mailing list