do_merge: Only build after conflicts

diff --git a/do_merge b/do_merge
index d4ba6369619b83b079082b4853c1d19b0e0c9092..2b688c4912f461f68da9e70930660af1491a778f 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -127,6 +127,7 @@ for h in $heads; do
                ;;
        *)
                execute git merge $h || {
+                       need_build=true
                        echo Merge failed 1>&2
                        echo $h >>../merge.debug
                        git diff >>../merge.debug 2>&1
@@ -159,6 +160,7 @@ for h in $heads; do
        [ -f "../merge-fixes/$tree" ] && {
                for p in $(cat "../merge-fixes/$tree"); do
                        "$bin_dir/merge_fix" -n "$p" || {
+                               need_build=true
                                notify-send -t 0 -u critical "linux-next merge fix failed for $tree!"
                                pushover "linux-next merge fix failed for $tree!"
                                bash -i || exit
@@ -170,14 +172,9 @@ for h in $heads; do
        printf "%s$tab%s\n" $tree $(git rev-parse "${h/\/*://}") >> $SHA1_FILE
        $no_build && continue
        $need_build || {
-               # See if we need to build after merging this tree
-               new_head=$(git rev-parse HEAD)
-               [ "$old_head" = "$new_head" ] ||
-                       [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] ||
-                               need_build=true
-       }
-       $need_build ||
+               echo "Build not required, skipping"
                continue
+       }
        do_build=$(grep -v '^#' $CTRL_FILE | awk -F '   ' '$3=="'$tree'" { print $6; }')
        [ "$do_build" = "yes" ] ||
                continue