From a2aed84c5ef0bdb1b34728a5840ef8eb4de78cb8 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Aug 2025 12:37:32 +1000
Subject: [PATCH] move check_unmerged_files into do_merge

That is only place it is used
---
 common.sh | 19 -------------------
 do_merge  | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/common.sh b/common.sh
index 0e88680..f0c93f1 100644
--- a/common.sh
+++ b/common.sh
@@ -118,23 +118,4 @@ get_build_flag()
 	get_control_field "$1" 6
 }
 
-check_unmerged_files()
-{
-	# "In POSIX sh, 'local' is undefined."
-	# shellcheck disable=SC3043
-	local tree="$1"
-	# shellcheck disable=SC3043
-	local um_files
-	# shellcheck disable=SC3043
-	local rm_files
-
-	um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')
-	if [ "$um_files" ] && [ -f "../merge-files/$tree" ]; then
-		rm_files=$(grep -F "$um_files" "../merge-files/$tree")
-		if [ "$rm_files" ]; then
-			"$bin_dir/do_rm" "$rm_files"
-		fi
-	fi
-}
-
 true
diff --git a/do_merge b/do_merge
index 509b7c5..85320d0 100755
--- a/do_merge
+++ b/do_merge
@@ -58,6 +58,23 @@ fix_up()
 	fi
 }
 
+check_unmerged_files()
+{
+	# "In POSIX sh, 'local' is undefined."
+	# shellcheck disable=SC3043
+	local tree um_files rm_files
+
+	tree="$1"
+
+	um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')
+	if [ "$um_files" ] && [ -f "../merge-files/$tree" ]; then
+		rm_files=$(grep -F "$um_files" "../merge-files/$tree")
+		if [ "$rm_files" ]; then
+			"$bin_dir/do_rm" "$rm_files"
+		fi
+	fi
+}
+
 if [ -f "$SHA1_FILE" ]; then
 	previous_tree=$(tail -n1 "$SHA1_FILE" | cut -f1 -d"$_TAB")
 elif [ -z "$start_from" ]; then
-- 
2.47.3