do_merge: Set need_build=false before merging

diff --git a/do_merge b/do_merge
index 339ec238d97d8be494e78f1afd740c65d84dfc32..d4ba6369619b83b079082b4853c1d19b0e0c9092 100755 (executable)
--- 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