series=""
resend="no"
GIT_FORMAT_PATCH_SUBJECT="PATCH"
+GIT_FORMAT_PATCH_OPTS="--histogram"
skip_compile=0
CHECKPATCH_OPS="--strict"
fi
if git branch | grep -q ${patches_branch}; then
- git branch -D ${patches_branch}
+ git branch -D ${patches_branch} 1>/dev/null
fi
if [ "${debug}" = "1" ]; then
git branch --set-upstream-to ${base_branch}
git cherry-pick ${COMMIT_START_SHA1}..${COMMIT_END_SHA1}
-GIT_FORMAT_PATCH_OPTS="--base=${base_commit}"
+GIT_FORMAT_PATCH_OPTS="${GIT_FORMAT_PATCH_OPTS} --base=${base_commit}"
if [ x"${cover}" = x"yes" ]; then
GIT_FORMAT_PATCH_OPTS="${GIT_FORMAT_PATCH_OPTS} --cover-letter"
if [ x"${cover}" = x"yes" ]; then
# Replace subject line in cover letter:
- sed -i -e "s/\*\*\* SUB.*/${subject}/" ${srcdir}/${series_prefix}0000-cover-letter.patch
+ sed -i -e "s@\*\*\* SUB.*@${subject}@" ${srcdir}/${series_prefix}0000-cover-letter.patch
# Replace blurb line in cover letter:
sed -i -e "/.*BLURB.*/{r /tmp/cover-letter.txt" -e 'd}' ${srcdir}/${series_prefix}0000-cover-letter.patch
git checkout -b ${temp_compile_branch} ${compile_branch}
- # Make sure temp_compile_branch is rebased on base_branch:
- git rebase ${base_branch}
-
# Apply all of our commits to temp_compile_branch:
git cherry-pick ${COMMIT_START_SHA1}..${COMMIT_END_SHA1}