Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Fargher <proglottis@gmail.com>2023-06-02 08:57:58 +0300
committerOK_MF <oski.kervinen@m-files.com>2023-06-02 08:57:58 +0300
commit0acc57c42192ab0fbaa4b465e068d13402b1773d (patch)
tree79f9a1cc0cabac611bf8eb5a174fc3e6002044c0
parent66d77ef23f6a04f320c68c753612d6cef8e8f0a8 (diff)
Applied 3 error tersification suggestions
-rw-r--r--internal/gitaly/service/operations/merge.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go
index e2cb7e0df..8d5359fb8 100644
--- a/internal/gitaly/service/operations/merge.go
+++ b/internal/gitaly/service/operations/merge.go
@@ -130,7 +130,7 @@ func (s *Server) UserMergeBranch(stream gitalypb.OperationService_UserMergeBranc
if errors.Is(err, git.ErrReferenceNotFound) {
return structerr.NewNotFound("%w", err)
}
- return structerr.NewInternal("branch resolution failed: %w", err)
+ return structerr.NewInternal("branch resolution: %w", err)
}
}
@@ -170,7 +170,7 @@ func (s *Server) UserMergeBranch(stream gitalypb.OperationService_UserMergeBranc
)
}
- return structerr.NewInternal("unknown merge error: %w", err)
+ return structerr.NewInternal("merge: %w", err)
}
mergeOID, err := git.ObjectHashSHA1.FromHex(mergeCommitID)
@@ -238,7 +238,7 @@ func (s *Server) UserMergeBranch(stream gitalypb.OperationService_UserMergeBranc
)
}
- return structerr.NewInternal("target update failed: %w", err)
+ return structerr.NewInternal("target update: %w", err)
}
if err := stream.Send(&gitalypb.UserMergeBranchResponse{