fix up get_pending_fixes

diff --git a/common.sh b/common.sh
index f0c93f18b72c4d02d530a21bea38f716303dc97b..0af41821f82f35403402eb390967d9dcdfd5be71 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -88,7 +88,15 @@ get_branches()
 
 get_pending_branches()
 {
-       awk -F "$_TAB" '/^[^-#]/ && $2=="git"{ print $3; } $1=="pending-fixes" { exit; }' "$CTRL_FILE"
+       awk -F "$_TAB" '
+               BEGIN { show=0 }
+               /^#/ { next }
+               $2=="switch" { if ($3=="fs-current" || $3=="master" ) show=1
+                       else if ($3=="fs-next") show=0
+                       next }
+               $2=="branch" && $3=="pending-fixes" { exit }
+               $2=="git" && $3=="fs-current" { next }
+               $2=="git" { if (show == 1) print $3 }' "$CTRL_FILE"
 }
 
 get_contacts()

diff --git a/final_msg b/final_msg
index 2a940c80d19d8950e93a2c6092debdcf7c654ffd..ef693dcb38145099af7241f637f0d04872a7b1f5 100755 (executable)
--- a/final_msg
+++ b/final_msg
@@ -11,7 +11,8 @@ nmc=$(git rev-list --no-merges --count origin/master..HEAD^)
 ss=$(git diff --shortstat -M -C origin/master..HEAD^)
 ntrees=$(get_branches | wc -l)
 npend=$(get_pending_branches | wc -l)
-npend=$(( npend - 1 ))
+# add one for my fixes tree
+npend=$(( npend + 1 ))
 
 sed -i.bak -e 's/^\(Changes since\) [0-9]*:/\1 '"$prev"':/' \
     -e 's/^\(Non-merge commits .*:\) [0-9]*/\1 '"$nmc"'/'\