summaryrefslogtreecommitdiffstats
path: root/scripts/create-pull-request
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/create-pull-request')
-rwxr-xr-xscripts/create-pull-request14
1 files changed, 3 insertions, 11 deletions
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 46d65386a3..e82858bc98 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] [-t in_reply_to] 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]
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
@@ -49,7 +49,6 @@ Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to
49 -s subject The subject to be inserted into the summary email 49 -s subject The subject to be inserted into the summary email
50 -u remote The git remote where the branch is located, or set CPR_CONTRIB_REMOTE in env 50 -u remote The git remote where the branch is located, or set CPR_CONTRIB_REMOTE in env
51 -d relative_dir Generate patches relative to directory 51 -d relative_dir Generate patches relative to directory
52 -t in_reply_to Make mails appear as replies to the given Message-Id, to continue patch/series threads
53 52
54 Examples: 53 Examples:
55 $CMD -u contrib -b nitin/basic 54 $CMD -u contrib -b nitin/basic
@@ -58,13 +57,12 @@ Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to
58 $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
59 $CMD -u contrib -p "RFC PATCH" -b nitin/experimental 58 $CMD -u contrib -p "RFC PATCH" -b nitin/experimental
60 $CMD -u contrib -i misc -b nitin/misc -d ./bitbake 59 $CMD -u contrib -i misc -b nitin/misc -d ./bitbake
61 $CMD -u contrib -p "OE-core][PATCH v2" -t "<cover.11146.git.john.doe@example.com>"
62EOM 60EOM
63} 61}
64 62
65REMOTE="$CPR_CONTRIB_REMOTE" 63REMOTE="$CPR_CONTRIB_REMOTE"
66# Parse and validate arguments 64# Parse and validate arguments
67while getopts "b:acd:hi:m:o:p:r:s:u:l:t:" OPT; do 65while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
68 case $OPT in 66 case $OPT in
69 b) 67 b)
70 BRANCH="$OPTARG" 68 BRANCH="$OPTARG"
@@ -110,8 +108,6 @@ while getopts "b:acd:hi:m:o:p:r:s:u:l:t:" OPT; do
110 a) 108 a)
111 CPR_CONTRIB_AUTO_PUSH="1" 109 CPR_CONTRIB_AUTO_PUSH="1"
112 ;; 110 ;;
113 t)
114 IN_REPLY_TO="$OPTARG"
115 esac 111 esac
116done 112done
117 113
@@ -209,11 +205,7 @@ if [ -n "$RELDIR" ]; then
209fi 205fi
210 206
211# Generate the patches and cover letter 207# Generate the patches and cover letter
212if [ -z "$IN_REPLY_TO" ]; then 208git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
213 git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --in-reply-to="$IN_REPLY_TO" --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
214else
215 git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
216fi
217 209
218if [ -z "$(ls -A $ODIR 2> /dev/null)" ]; then 210if [ -z "$(ls -A $ODIR 2> /dev/null)" ]; then
219 echo "ERROR: $ODIR is empty, no cover letter and patches was generated!" 211 echo "ERROR: $ODIR is empty, no cover letter and patches was generated!"