|
@@ -34,7 +34,7 @@ RFC=0
|
|
|
usage() {
|
|
|
CMD=$(basename $0)
|
|
|
cat <<EOM
|
|
|
-Usage: $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]
|
|
|
+Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] [-d relative_dir] -u remote [-b branch]
|
|
|
-b branch Branch name in the specified remote (default: current branch)
|
|
|
-l local branch Local branch name (default: HEAD)
|
|
|
-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
|
|
|
-s subject The subject to be inserted into the summary email
|
|
|
-u remote The git remote where the branch is located, or set CPR_CONTRIB_REMOTE in env
|
|
|
-d relative_dir Generate patches relative to directory
|
|
|
- -t in_reply_to Make mails appear as replies to the given Message-Id, to continue patch/series threads
|
|
|
|
|
|
Examples:
|
|
|
$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
|
|
|
$CMD -u contrib -r master -i misc -b nitin/misc -o pull-misc
|
|
|
$CMD -u contrib -p "RFC PATCH" -b nitin/experimental
|
|
|
$CMD -u contrib -i misc -b nitin/misc -d ./bitbake
|
|
|
- $CMD -u contrib -p "OE-core][PATCH v2" -t "<cover.11146.git.john.doe@example.com>"
|
|
|
EOM
|
|
|
}
|
|
|
|
|
|
REMOTE="$CPR_CONTRIB_REMOTE"
|
|
|
# Parse and validate arguments
|
|
|
-while getopts "b:acd:hi:m:o:p:r:s:u:l:t:" OPT; do
|
|
|
+while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
|
|
|
case $OPT in
|
|
|
b)
|
|
|
BRANCH="$OPTARG"
|
|
@@ -110,8 +108,6 @@ while getopts "b:acd:hi:m:o:p:r:s:u:l:t:" OPT; do
|
|
|
a)
|
|
|
CPR_CONTRIB_AUTO_PUSH="1"
|
|
|
;;
|
|
|
- t)
|
|
|
- IN_REPLY_TO="$OPTARG"
|
|
|
esac
|
|
|
done
|
|
|
|
|
@@ -209,11 +205,7 @@ if [ -n "$RELDIR" ]; then
|
|
|
fi
|
|
|
|
|
|
# Generate the patches and cover letter
|
|
|
-if [ -z "$IN_REPLY_TO" ]; then
|
|
|
- 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
|
|
|
-else
|
|
|
- git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
|
|
|
-fi
|
|
|
+git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
|
|
|
|
|
|
if [ -z "$(ls -A $ODIR 2> /dev/null)" ]; then
|
|
|
echo "ERROR: $ODIR is empty, no cover letter and patches was generated!"
|