diff options
| author | John Cai <jcai@gitlab.com> | 2023-05-09 06:30:28 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2023-05-09 06:30:28 +0300 |
| commit | 74fc4b6f1f75a643733514183e00be371473e57d (patch) | |
| tree | 554f816e68482bc9cf314c0e7483fad26b27b6da | |
| parent | 164a180d14372d177bca0b85e90c7c69a7e8c806 (diff) | |
| parent | b0afb509cc00010b0247eaa2f2411fe70d684c04 (diff) | |
Merge branch 'xx/drop-unused-param-for-merge' into 'master'
operations: Drop unused param repoPath for merge
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5739
Merged-by: John Cai <jcai@gitlab.com>
Approved-by: karthik nayak <knayak@gitlab.com>
Approved-by: John Cai <jcai@gitlab.com>
Co-authored-by: Xing Xin <xingxin.xx@bytedance.com>
| -rw-r--r-- | internal/gitaly/service/operations/merge.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go index 4b0340eb6..ff9207cbf 100644 --- a/internal/gitaly/service/operations/merge.go +++ b/internal/gitaly/service/operations/merge.go @@ -53,7 +53,6 @@ func validateMergeBranchRequest(request *gitalypb.UserMergeBranchRequest) error func (s *Server) merge( ctx context.Context, - repoPath string, quarantineRepo *localrepo.Repo, authorName string, authorMail string, @@ -110,11 +109,6 @@ func (s *Server) UserMergeBranch(stream gitalypb.OperationService_UserMergeBranc return err } - repoPath, err := quarantineRepo.Path() - if err != nil { - return err - } - referenceName := git.NewReferenceNameFromBranchName(string(firstRequest.Branch)) var revision git.ObjectID @@ -145,7 +139,7 @@ func (s *Server) UserMergeBranch(stream gitalypb.OperationService_UserMergeBranc return structerr.NewInvalidArgument("%w", err) } - mergeCommitID, mergeErr := s.merge(ctx, repoPath, quarantineRepo, + mergeCommitID, mergeErr := s.merge(ctx, quarantineRepo, string(firstRequest.User.Name), string(firstRequest.User.Email), authorDate, |