diff options
| author | John Cai <jcai@gitlab.com> | 2023-08-28 19:04:35 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2023-08-28 19:04:35 +0300 |
| commit | 293da87cea14b58e078243b4768f4e0a91215abf (patch) | |
| tree | 8750675632ffc44184650563aa03f37454c5fe2c | |
| parent | 357e09f248881f0461a5ec8989ca01ccd9b2a860 (diff) | |
| parent | f1868ed94662bfd1fdeed683271ad8b4cdfd9969 (diff) | |
Merge branch 'xx/remove-redundant-git2go-conflict-checking-for-squash' into 'master'
squash: Remove redundant git2go conflict checking
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6288
Merged-by: John Cai <jcai@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/squash.go | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/internal/gitaly/service/operations/squash.go b/internal/gitaly/service/operations/squash.go index f772d032e..9f712b3c9 100644 --- a/internal/gitaly/service/operations/squash.go +++ b/internal/gitaly/service/operations/squash.go @@ -7,7 +7,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/git" "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git2go" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" @@ -145,36 +144,11 @@ func (s *Server) userSquash(ctx context.Context, req *gitalypb.UserSquashRequest true, ) if err != nil { - var conflictErr git2go.ConflictingFilesError - - if errors.As(err, &conflictErr) { - conflictingFiles := make([][]byte, 0, len(conflictErr.ConflictingFiles)) - for _, conflictingFile := range conflictErr.ConflictingFiles { - conflictingFiles = append(conflictingFiles, []byte(conflictingFile)) - } - - return "", structerr.NewFailedPrecondition("squashing commits: %w", err).WithDetail( - &gitalypb.UserSquashError{ - // Note: this is actually a merge conflict, but we've kept - // the old "rebase" name for compatibility reasons. - Error: &gitalypb.UserSquashError_RebaseConflict{ - RebaseConflict: &gitalypb.MergeConflictError{ - ConflictingFiles: conflictingFiles, - ConflictingCommitIds: []string{ - startCommit.String(), - endCommit.String(), - }, - }, - }, - }, - ) - } - var mergeConflictErr *localrepo.MergeTreeConflictError if errors.As(err, &mergeConflictErr) { conflictingFiles := make([][]byte, 0, len(mergeConflictErr.ConflictingFileInfo)) - for _, conflictingFile := range mergeConflictErr.ConflictingFileInfo { - conflictingFiles = append(conflictingFiles, []byte(conflictingFile.FileName)) + for _, conflictingFileInfo := range mergeConflictErr.ConflictingFileInfo { + conflictingFiles = append(conflictingFiles, []byte(conflictingFileInfo.FileName)) } return "", structerr.NewFailedPrecondition("squashing commits: %w", err).WithDetail( |