From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 6 Jun 2018 01:26:17 +0000 (+1000)
Subject: fetch_trees: skip the "branch" control lines
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=9f4ebb82a36c9a07888766157b5e717fde5e1df0;p=next-scripts

fetch_trees: skip the "branch" control lines
---

diff --git a/check_left b/check_left
index 1e1a749..079d699 100755
--- a/check_left
+++ b/check_left
@@ -5,6 +5,7 @@ LOG_FILE="../left_over.log"
 cp /dev/null "$LOG_FILE"
 
 heads=$(awk -F '\t' '/^#/ {next;} { printf("%s/%s ", $3, $5); }' ../etc/control)
+prev_heads=""
 
 total=0
 
@@ -25,16 +26,22 @@ for h in $heads; do
 #	c=$(git rev-list --no-merges origin/master.."$h")
 #	[ -z "$c" ] &&
 #		continue
-	count=$(git rev-list --count --no-merges "$base".."$h")
+	count=$(git rev-list --count --no-merges $prev_heads  "$base".."$h")
 	[ "$count" == 0 ] &&
 		continue
 
-	echo "$h" "$count" | tee -a "$LOG_FILE"
+	total=$(( $total + $count ))
+	echo | tee -a "$LOG_FILE"
+	echo "${h%%/*}" "$count" | tee -a "$LOG_FILE"
+	echo | tee -a "$LOG_FILE"
 #	git shortlog --no-walk "$c" 2>&1 | tee -a "$LOG_FILE"
-	git log --oneline --no-merges "$base".."$h" | tee -a "$LOG_FILE"
+	git log --oneline --no-merges $prev_heads "$base".."$h" | tee -a "$LOG_FILE"
 
 #	gitk stable..$h
-
+	prev_heads="$prev_heads ^$h"
 done
 
+echo | tee -a "$LOG_FILE"
+echo "Total $total"
+
 exit 0
diff --git a/fetch_trees b/fetch_trees
index 88efd94..b15e35b 100755
--- a/fetch_trees
+++ b/fetch_trees
@@ -5,7 +5,7 @@
 [ "$1" = "-n" ] && {
 	shift
 	last=$(tail -n1 $SHA1_FILE | cut -f1 -d$'\t')
-	start_from=$(awk -F '\t' '$3 == "'$last'" { getline; print $3; exit 0; }' $CTRL_FILE)
+	start_from=$(awk -F '\t' '$3 == "'$last'" { do getline; while (/^#/ || $2 == "branch"); print $3; exit 0; }' $CTRL_FILE)
 }
 
 [ "$1" = "-s" ] && {