From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 16 Apr 2009 04:49:40 +0000 (+1000)
Subject: suppress some more unneeded builds
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=0e3e9073e2ec92835c073bb24a264747c0675585;p=next-scripts

suppress some more unneeded builds
---

diff --git a/do_merge b/do_merge
index d164812..789d361 100755
--- 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