From e048d8273b6d93b94e5bd686788df3eb024d188d Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 17 Sep 2021 07:55:49 +1000
Subject: [PATCH] do_build: update the SHA1 file before applying fixes

---
 do_merge | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/do_merge b/do_merge
index 1668493..955f52a 100755
--- a/do_merge
+++ b/do_merge
@@ -110,6 +110,13 @@ for h in $heads; do
 			execute git diff -M --stat --summary 'HEAD^..'
 #		fi
 	fi
+
+	tab=$'\t'
+	if [ "${#tree}" -lt 8 ]; then
+		tab=$'\t\t'
+	fi
+	printf '%s%s%s\n' "$tree" "$tab" "$(git rev-parse "$h^{}")" >> "$SHA1_FILE"
+
 	if [ -f "../merge-fixes/$tree" ]; then
 		while read -r p <&7; do
 			if ! "$bin_dir/merge_fix" -n "$p"; then
@@ -118,12 +125,6 @@ for h in $heads; do
 		done 7<"../merge-fixes/$tree"
 	fi
 
-	tab=$'\t'
-	if [ "${#tree}" -le 8 ]; then
-		tab=$'\t\t'
-	fi
-	printf '%s%s%s\n' "$tree" "$tab" "$(git rev-parse "$h^{}")" >> "$SHA1_FILE"
-
 	if $no_build; then
 		continue
 	fi
-- 
2.39.5