From d10f08472eede7bf3955db02446a1cf7150196d5 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 3 Nov 2016 09:12:33 +0100 Subject: [PATCH] scripts: show full headline with checkpatch The Subject in an email can be split on two lines. In such case, the second line (starting with a space) can be joined to the first one. It is handled differently when parsing stdin or a file. Signed-off-by: Thomas Monjalon --- scripts/checkpatches.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/checkpatches.sh b/scripts/checkpatches.sh index 619ac217f1..2f67d248fd 100755 --- a/scripts/checkpatches.sh +++ b/scripts/checkpatches.sh @@ -101,13 +101,16 @@ check () { # if [ -n "$1" ] ; then for patch in "$@" ; do - subject=$(sed -n 's,^Subject: ,,p' "$patch") + # Subject can be on 2 lines + subject=$(sed '/^Subject: */!d;s///;N;s,\n[[:space:]]\+, ,;s,\n.*,,;q' "$patch") check "$patch" '' "$subject" done elif [ ! -t 0 ] ; then # stdin subject=$(while read header value ; do if [ "$header" = 'Subject:' ] ; then - echo $value + IFS= read next + continuation=$(echo "$next" | sed -n 's,^[[:space:]]\+, ,p') + echo $value$continuation break fi done) -- 2.20.1