From 5ffa98a95317e6bea436e4372b9202f4da0ce2ae Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 3 Feb 2015 09:08:29 -0800 Subject: create-pull-request: Fix git request-pull Signed-off-by: Saul Wold --- scripts/create-pull-request | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts/create-pull-request') 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 -- # 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 -- cgit 1.2.3-korg