suppress some more unneeded builds

diff --git a/do_merge b/do_merge
index d1648123d08ad4f1e329521afde531efd962808c..789d3619a102ce5f91576dba9954ae7e447400c3 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -70,10 +70,8 @@ for h in $heads; do
                # See if we need to build after merging this tree
                new_head=$(git rev-parse HEAD)
                [ "$old_head" = "$new_head" ] ||
-                       need_build=true
-               $need_build || 
                        [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] ||
-                       need_build=true
+                               need_build=true
        }
        $need_build ||
                continue