Move default branch verification to processTransaction

Transaction's default branch update is currently being verified
in verifyReference. If the verification passes, the branch update
is set in the returned log entry. We're soon going to change
verifyReferences to not return a log entry but just the reference
updates. This makes it easier to compose the log entry from various
parts of the transaction. To facilitate this, move default branch
verification to happen directly in processTransaction.

1 files changed, 10 insertions, 10 deletions

diff --git a/internal/gitaly/transaction_manager.go b/internal/gitaly/transaction_manager.go
index b434dc5e7..c20b099b1 100644
--- a/internal/gitaly/transaction_manager.go
+++ b/internal/gitaly/transaction_manager.go
@@ -627,6 +627,16 @@ func (mgr *TransactionManager) processTransaction() (returnedErr error) {
 			return fmt.Errorf("verify references: %w", err)
 		}
 
+		if transaction.defaultBranchUpdate != nil {
+			if err := mgr.verifyDefaultBranchUpdate(mgr.ctx, transaction); err != nil {
+				return fmt.Errorf("verify default branch update: %w", err)
+			}
+
+			logEntry.DefaultBranchUpdate = &gitalypb.LogEntry_DefaultBranchUpdate{
+				ReferenceName: []byte(transaction.defaultBranchUpdate.Reference),
+			}
+		}
+
 		if transaction.customHooksUpdate != nil {
 			logEntry.CustomHooksUpdate = &gitalypb.LogEntry_CustomHooksUpdate{
 				CustomHooksTar: transaction.customHooksUpdate.CustomHooksTAR,
@@ -915,16 +925,6 @@ func (mgr *TransactionManager) verifyReferences(ctx context.Context, transaction
 		return nil, fmt.Errorf("verify references with git: %w", err)
 	}
 
-	if transaction.defaultBranchUpdate != nil {
-		if err := mgr.verifyDefaultBranchUpdate(ctx, transaction); err != nil {
-			return nil, fmt.Errorf("verify default branch update: %w", err)
-		}
-
-		logEntry.DefaultBranchUpdate = &gitalypb.LogEntry_DefaultBranchUpdate{
-			ReferenceName: []byte(transaction.defaultBranchUpdate.Reference),
-		}
-	}
-
 	return logEntry, nil
 }