diff options
author | Jakub Kicinski <kuba@kernel.org> | 2020-11-11 15:22:04 -0800 |
---|---|---|
committer | Daniel Borkmann <daniel@iogearbox.net> | 2020-11-13 17:48:40 +0100 |
commit | 9b46f58c0a59265e9f2204670f7c52ebdd5149ab (patch) | |
tree | 9645c198d796b7302ca18b142243e9365be2dd69 | |
parent | 99babde7dab06d67e8c64d882f63c07c2cc5143a (diff) | |
download | pw-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-x | pw-pull | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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 |