mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-13 09:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "create-pull-request: add "-t in-reply-to" option"

Browse Source 
Rasons:
 - It breaks the script if script is used without -t
 - Its functionality covered by the next patch

This reverts commit 3ad3fda6c5.

(From OE-Core rev: 9be68e6f058e2ab149e5c6f045479413cf0db69b)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2017-05-17 13:14:56 +00:00
committed by Richard Purdie
parent c523b2ba27
commit 7e23b174e5
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/create-pull-request
View File

@@ -34,7 +34,7 @@ RFC=0
usage() { usage() {
CMD=$(basename $0) CMD=$(basename $0)
cat <<EOM 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) -b branch Branch name in the specified remote (default: current branch)
-l local branch Local branch name (default: HEAD) -l local branch Local branch name (default: HEAD)
-c Create an RFC (Request for Comment) patch series -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 -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 -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 -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: Examples:
$CMD -u contrib -b nitin/basic $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 -r master -i misc -b nitin/misc -o pull-misc
$CMD -u contrib -p "RFC PATCH" -b nitin/experimental $CMD -u contrib -p "RFC PATCH" -b nitin/experimental
$CMD -u contrib -i misc -b nitin/misc -d ./bitbake $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 EOM
} }
REMOTE="$CPR_CONTRIB_REMOTE" REMOTE="$CPR_CONTRIB_REMOTE"
# Parse and validate arguments # 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 case $OPT in
b) b)
BRANCH="$OPTARG" BRANCH="$OPTARG"
@@ -110,8 +108,6 @@ while getopts "b:acd:hi:m:o:p:r:s:u:l:t:" OPT; do
a) a)
CPR_CONTRIB_AUTO_PUSH="1" CPR_CONTRIB_AUTO_PUSH="1"
;; ;;
t)
IN_REPLY_TO="$OPTARG"
esac esac
done done
@@ -209,11 +205,7 @@ if [ -n "$RELDIR" ]; then
fi fi
# Generate the patches and cover letter # 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 --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
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
if [ -z "$(ls -A $ODIR 2> /dev/null)" ]; then if [ -z "$(ls -A $ODIR 2> /dev/null)" ]; then
echo "ERROR: $ODIR is empty, no cover letter and patches was generated!" echo "ERROR: $ODIR is empty, no cover letter and patches was generated!"