X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=final_msg;h=979da9b6bfa196a37dd87260a4427d5e9def2801;hb=HEAD;hp=da9ec44271f720c8a76540ddc3941cada53d7c63;hpb=560ce17516f98ac4d747f7e491721b6fd896811c;p=next-scripts

diff --git a/final_msg b/final_msg
index da9ec44..979da9b 100755
--- a/final_msg
+++ b/final_msg
@@ -10,13 +10,16 @@ prev=$(git tag -l next-* | sort | tail -n 2 | head -n 1 | sed 's/next-//')
 nmc=$(git rev-list --no-merges --count origin/master..HEAD^)
 ss=$(git diff --shortstat -M -C origin/master..HEAD^)
 ntrees=$(grep -v -c '^#' "$CTRL_FILE")
+npend=$(sed '/^#/d;/^pending-fixes/q' "$CTRL_FILE" | wc -l)
+npend=$(( npend - 2 ))
 
 sed -i.bak -e 's/^\(Changes since\) [0-9]*:/\1 '"$prev"':/' \
     -e 's/^\(Non-merge commits .*:\) [0-9]*/\1 '"$nmc"'/'\
     -e 's/^ *[0-9]* files changed,.*$/'"$ss"'/' \
     -e 's/^\(I am currently merging\) [0-9]* /\1 '"$ntrees"' /' \
+    -e 's/ [0-9]* \(trees of bug\)/ '"$npend"' \1/' \
     ../last_msg
 
-"$tools_dir/send_email" "$to" "$cc" "$subject" <../last_msg
+"$tools_dir/send_email" "$subject" "$to" "$cc" <../last_msg
 
 exit 0