Merge branch 'pks-git2go-merge-precondition-failed' into 'master'

operations: Return correct error code when merge fails

See merge request gitlab-org/gitaly!2690

3 files changed, 7 insertions, 1 deletions

diff --git a/changelogs/unreleased/pks-git2go-merge-precondition-failed.yml b/changelogs/unreleased/pks-git2go-merge-precondition-failed.yml
new file mode 100644
index 000000000..7e23eeb2c
--- /dev/null
+++ b/changelogs/unreleased/pks-git2go-merge-precondition-failed.yml
@@ -0,0 +1,5 @@
+---
+title: 'operations: Return correct error code when merge fails'
+merge_request: 2690
+author:
+type: fixed
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go
index f186a33e9..6d2f2b3e5 100644
--- a/internal/gitaly/service/operations/merge.go
+++ b/internal/gitaly/service/operations/merge.go
@@ -437,7 +437,7 @@ func (s *server) userMergeToRef(ctx context.Context, request *gitalypb.UserMerge
 			return nil, helper.ErrInvalidArgument(err)
 		}
 		//nolint:stylecheck
-		return nil, fmt.Errorf("Failed to create merge commit for source_sha %s and target_sha %s at %s", sourceRef, string(request.TargetRef), refName)
+		return nil, helper.ErrPreconditionFailed(fmt.Errorf("Failed to create merge commit for source_sha %s and target_sha %s at %s", sourceRef, string(request.TargetRef), refName))
 	}
 
 	// ... and move branch from target ref to the merge commit. The Ruby
diff --git a/internal/gitaly/service/operations/merge_test.go b/internal/gitaly/service/operations/merge_test.go
index d165c6f27..19d9b6c04 100644
--- a/internal/gitaly/service/operations/merge_test.go
+++ b/internal/gitaly/service/operations/merge_test.go
@@ -681,6 +681,7 @@ func testConflictsOnUserMergeToRefRequest(t *testing.T, ctx context.Context) {
 
 		_, err := client.UserMergeToRef(ctx, request)
 		require.Error(t, err)
+		testhelper.RequireGrpcError(t, err, codes.FailedPrecondition)
 	})
 }