Update AC_CONFIG_SRCDIR after scripts/vs removal

[hvutilities.git] / scripts / kernel-send-patches.sh

diff --git a/scripts/kernel-send-patches.sh b/scripts/kernel-send-patches.sh
index 6231ac8..4e7688f 100755 (executable)
--- a/scripts/kernel-send-patches.sh
+++ b/scripts/kernel-send-patches.sh
@@ -56,6 +56,7 @@ cover="no"
 series=""
 resend="no"
 GIT_FORMAT_PATCH_SUBJECT="PATCH"
+GIT_FORMAT_PATCH_OPTS="--histogram"
 skip_compile=0
 CHECKPATCH_OPS="--strict"
 
@@ -285,7 +286,7 @@ if [ x"${orig_branch}" = x"" ]; then
 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
@@ -298,7 +299,7 @@ git checkout -b ${patches_branch} ${base_branch}
 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"
@@ -319,7 +320,7 @@ git format-patch --subject-prefix="${GIT_FORMAT_PATCH_SUBJECT}" \
 
 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
@@ -370,9 +371,6 @@ EOF
 
     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}