From 8cfba81b2cda2771500034079f94b6bea2e6ed3e Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 8 Aug 2024 08:25:41 -0700
Subject: [PATCH] prepare-source: Move go fmt to last step

When rebasing, the generated code ends up with conflict markers in it
and go fmt quits with an error. This change regenerates the code first
so that fmt is happy with it.
---
 tools/prepare-source.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/prepare-source.sh b/tools/prepare-source.sh
index bdda1e01ad..3a64ddcf22 100755
--- a/tools/prepare-source.sh
+++ b/tools/prepare-source.sh
@@ -14,8 +14,8 @@ $GO_BINARY download
 $GO_BINARY mod tidy
 $GO_BINARY mod vendor
 
-# ... the code is formatted correctly, ...
-$GO_BINARY fmt ./...
-
 # ... and all code has been regenerated from its sources.
 $GO_BINARY generate ./...
+
+# ... the code is formatted correctly, ...
+$GO_BINARY fmt ./...