aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2020-11-11 15:22:04 -0800
committerDaniel Borkmann <daniel@iogearbox.net>2020-11-13 17:48:40 +0100
commit9b46f58c0a59265e9f2204670f7c52ebdd5149ab (patch)
tree9645c198d796b7302ca18b142243e9365be2dd69
parent99babde7dab06d67e8c64d882f63c07c2cc5143a (diff)
downloadpw-9b46f58c0a59265e9f2204670f7c52ebdd5149ab.tar.gz
pw-pull: cut off at 'Please consider'
Alexei sent a PR without the --- delimiter, handle that better. Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rwxr-xr-xpw-pull5
1 files changed, 4 insertions, 1 deletions
diff --git a/pw-pull b/pw-pull
index 93fda0d..792b0a3 100755
--- a/pw-pull
+++ b/pw-pull
@@ -74,7 +74,10 @@ if [ "$significant_lines" -le 1 ]; then
# Construct the message from email body if tag is empty
pull_msg=$(echo "$pull_json" |
jq -r '.content' |
- awk 'BEGIN {e=0} /^---/ {e=1} {if(!e) print}')
+ awk 'BEGIN {e=0}
+ /^---/ {e=1}
+ /^Please consider/ {e=1}
+ {if(!e) print}')
git commit --amend --signoff -F- <<EOF
$merge_header