summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/create-pull-request14
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index e82858bc98..280880b3f7 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -34,7 +34,7 @@ RFC=0
34usage() { 34usage() {
35CMD=$(basename $0) 35CMD=$(basename $0)
36cat <<EOM 36cat <<EOM
37Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] [-d relative_dir] -u remote [-b branch] 37Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] [-d relative_dir] -u remote [-b branch] [-- <format-patch options>]
38 -b branch Branch name in the specified remote (default: current branch) 38 -b branch Branch name in the specified remote (default: current branch)
39 -l local branch Local branch name (default: HEAD) 39 -l local branch Local branch name (default: HEAD)
40 -c Create an RFC (Request for Comment) patch series 40 -c Create an RFC (Request for Comment) patch series
@@ -57,6 +57,7 @@ Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to
57 $CMD -u contrib -r master -i misc -b nitin/misc -o pull-misc 57 $CMD -u contrib -r master -i misc -b nitin/misc -o pull-misc
58 $CMD -u contrib -p "RFC PATCH" -b nitin/experimental 58 $CMD -u contrib -p "RFC PATCH" -b nitin/experimental
59 $CMD -u contrib -i misc -b nitin/misc -d ./bitbake 59 $CMD -u contrib -i misc -b nitin/misc -d ./bitbake
60 $CMD -u contrib -r origin/master -o /tmp/out.v3 -- -v3 --in-reply-to=20170511120134.XX7799@site.com
60EOM 61EOM
61} 62}
62 63
@@ -108,9 +109,16 @@ while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
108 a) 109 a)
109 CPR_CONTRIB_AUTO_PUSH="1" 110 CPR_CONTRIB_AUTO_PUSH="1"
110 ;; 111 ;;
112 --)
113 shift
114 break
115 ;;
111 esac 116 esac
112done 117done
113 118
119shift "$((OPTIND - 1))"
120extraopts="$@"
121
114if [ -z "$REMOTE" ]; then 122if [ -z "$REMOTE" ]; then
115 echo "ERROR: Missing parameter -u or CPR_CONTRIB_REMOTE in env, no git remote!" 123 echo "ERROR: Missing parameter -u or CPR_CONTRIB_REMOTE in env, no git remote!"
116 usage 124 usage
@@ -201,7 +209,7 @@ if [ -n "$RELDIR" ]; then
201 ODIR=$(realpath $ODIR) 209 ODIR=$(realpath $ODIR)
202 pdir=$(pwd) 210 pdir=$(pwd)
203 cd $RELDIR 211 cd $RELDIR
204 extraopts="--relative" 212 extraopts="$extraopts --relative"
205fi 213fi
206 214
207# Generate the patches and cover letter 215# Generate the patches and cover letter
@@ -218,7 +226,7 @@ fi
218[ -n "$RELDIR" ] && cd $pdir 226[ -n "$RELDIR" ] && cd $pdir
219 227
220# Customize the cover letter 228# Customize the cover letter
221CL="$ODIR/0000-cover-letter.patch" 229CL="$(echo $ODIR/*0000-cover-letter.patch)"
222PM="$ODIR/pull-msg" 230PM="$ODIR/pull-msg"
223GIT_VERSION=$(`git --version` | tr -d '[:alpha:][:space:].' | sed 's/\(...\).*/\1/') 231GIT_VERSION=$(`git --version` | tr -d '[:alpha:][:space:].' | sed 's/\(...\).*/\1/')
224NEWER_GIT_VERSION=210 232NEWER_GIT_VERSION=210