From: Stephen Rothwell Date: Mon, 20 Mar 2023 23:04:18 +0000 (+1100) Subject: message_helper: ignore old version merges X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=9435e18bef1ac243e9d87de663f751195a94365e;p=next-scripts message_helper: ignore old version merges --- diff --git a/message_helper b/message_helper index d13360a..a7c3852 100755 --- a/message_helper +++ b/message_helper @@ -28,7 +28,7 @@ cc=( 'Linux Next Mailing List ' "$@" ) if [ -z "$branch" ]; then - branch=$(grep '^Merging ' "$log" | tail -n 1 | + branch=$(grep '^Merging ' "$log" | grep -v ' version ' | tail -n 1 | sed 's/^Merging \([^ /]*\).*$/\1/') fi