do_merge: Prompt whether a build should happen

diff --git a/do_merge b/do_merge
index 2b688c4912f461f68da9e70930660af1491a778f..b21d9b8b851155f338c446822fbfc9e4f5e35af6 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -178,6 +178,15 @@ for h in $heads; do
        do_build=$(grep -v '^#' $CTRL_FILE | awk -F '   ' '$3=="'$tree'" { print $6; }')
        [ "$do_build" = "yes" ] ||
                continue
+
+       notify-send -u normal "Waiting for build confirmation for $tree"
+       echo "Do build for $tree? ($i/$total) y/n"
+       read response
+       if [ "$response" != "y" ]; then
+               echo "skipping build"
+               continue
+       fi
+
        git push -f "$build_host":"$build_dir" master:refs/heads/next || {
                echo git push failed 1>&2
                notify-send -t 0 -u critical "linux-next push failed for $tree!"