From: Michael Ellerman <mpe@ellerman.id.au>
Date: Fri, 19 Jun 2015 05:38:34 +0000 (+1000)
Subject: do_merge: Set need_build=false before merging
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=679110aaf162c8b023dc229c22cce2ae2d9c809f;p=next-scripts

do_merge: Set need_build=false before merging
---

diff --git a/do_merge b/do_merge
index 339ec23..d4ba636 100755
--- a/do_merge
+++ b/do_merge
@@ -96,8 +96,6 @@ tmp=($heads)
 total=${#tmp[@]}
 i=0
 
-need_build=false
-
 for h in $heads; do
 	tree=${h%%/*}
 	i=$((i+1))
@@ -110,6 +108,8 @@ for h in $heads; do
 		fi
 	}
 
+	need_build=false
+
 	hlog=$(git log -1 --oneline ${h/\/*://}) 2>/dev/null
 	old_head=$(git rev-parse HEAD)
 	[ -f "../pre-merge/$tree" ] && {
@@ -195,8 +195,6 @@ for h in $heads; do
 	}
 
 	notify-send -u normal "Merge and build of $tree successful"
-
-	need_build=false
 done
 
 exit 0