From 86d33a0fa262a5f19fa168832636ad4072176129 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Jul 2023 16:59:23 +1000
Subject: [PATCH] do_merge: exit on build failure

we can just retsart do_merge in this case
---
 do_merge | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/do_merge b/do_merge
index a14b51e..cecd327 100755
--- a/do_merge
+++ b/do_merge
@@ -35,7 +35,7 @@ execute()
 	return "$_err"
 }
 
-fix_up()
+report()
 {
 	if [ -n "$1" ]; then
 		linux-next-notify "$1"
@@ -43,6 +43,11 @@ fix_up()
 	if [ -n "$2" ]; then
 		printf '%s\n' "$2" 1>&2
 	fi
+}
+
+fix_up()
+{
+	report "$@"
 	if ! bash -i; then
 		exit
 	fi
@@ -164,7 +169,8 @@ for h in $heads; do
 		fix_up "pre-build script failed for $tree" "Prebuild script failed"
 	fi
 	if ! "$bin_dir/do_build" "$tree"; then
-		fix_up "build failed for $tree" "Build failed"
+		report "build failed for $tree" "Build failed - run do_merge when fixed"
+		exit 1
 	fi
 
 	need_build=false
-- 
2.39.5