From 7b5490ac10305dbecf57f21f57b56faa56e35226 Mon Sep 17 00:00:00 2001
From: Johannes Batzill <johannes.batzill@harness.io>
Date: Tue, 22 Oct 2024 23:06:12 +0000
Subject: [PATCH] fix: [CODE-2583]: fix dry-running merge without merge method
 (#2852)

* fix: [CODE-2583]: fix dry-running merge without merge method
---
 app/api/controller/pullreq/merge.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/pullreq/merge.go b/app/api/controller/pullreq/merge.go
index bd6dba2ae..b53965545 100644
--- a/app/api/controller/pullreq/merge.go
+++ b/app/api/controller/pullreq/merge.go
@@ -102,9 +102,15 @@ func (c *Controller) Merge(
 	pullreqNum int64,
 	in *MergeInput,
 ) (*types.MergeResponse, *types.MergeViolations, error) {
+	// keep track of original method in case it's empty, as it is optional for dry-run.
+	originalMergeMethod := in.Method
 	if err := in.sanitize(); err != nil {
 		return nil, nil, err
 	}
+	if originalMergeMethod != "" {
+		// use sanitized version if a non-empty merge method was provided.
+		originalMergeMethod = in.Method
+	}
 
 	requiredPermission := enum.PermissionRepoPush
 	if in.DryRun {
@@ -212,7 +218,7 @@ func (c *Controller) Merge(
 		SourceRepo:         sourceRepo,
 		PullReq:            pr,
 		Reviewers:          reviewers,
-		Method:             in.Method,
+		Method:             originalMergeMethod,
 		CheckResults:       checkResults,
 		CodeOwners:         codeOwnerWithApproval,
 	})