From: Michael Ellerman <mpe@ellerman.id.au>
Date: Fri, 19 Jun 2015 05:36:58 +0000 (+1000)
Subject: do_merge: Count trees and keep count of progress
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=02d0cf120598926184502b7891dead3b6aed1abc;p=next-scripts

do_merge: Count trees and keep count of progress
---

diff --git a/do_merge b/do_merge
index 0dfa7d5..339ec23 100755
--- a/do_merge
+++ b/do_merge
@@ -92,10 +92,15 @@ do_rebase()
 
 heads=$(grep -v '^#' $CTRL_FILE | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
 
+tmp=($heads)
+total=${#tmp[@]}
+i=0
+
 need_build=false
 
 for h in $heads; do
 	tree=${h%%/*}
+	i=$((i+1))
 
 	[ -n "$start_from" ] && {
 		if [ "$tree" = "$start_from" ]; then