do_build: update the SHA1 file before applying fixes

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index 1668493d51fdd9c366ec8340276ceba022552b09..955f52a4e82c0d90f510e595a41aeb3e8b2fd4b5 100755 (executable)
--- 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