From: Ed Bartosh Date: Wed, 5 Aug 2015 09:16:00 +0000 (+0300) Subject: create-pull-request: cd to relative directory X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~29471 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3042956a86167f89beccc5d05f1fad1844e7c36a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git create-pull-request: cd to relative directory create-pull-request -d path creates empty patches if directory is specified as a path, i.e. ./bitbake or ./bitbake/ or full path. It behaves expected way only if script is run with -d bitbake, i.e. relative dir name doesn't contain '\'. Fixed this unwanted behaviour by changing directory and running git format-patch in it with --relative, without specifying relative path as a parameter. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 216edfd751b..be493795b56 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -177,12 +177,15 @@ mkdir $ODIR if [ -n "$RELDIR" ]; then ODIR=$(realpath $ODIR) - extraopts="--relative=$RELDIR" + pushd $RELDIR > /dev/null + extraopts="--relative" fi # Generate the patches and cover letter git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null +[ -n "$RELDIR" ] && popd > /dev/null + # Customize the cover letter CL="$ODIR/0000-cover-letter.patch" PM="$ODIR/pull-msg"