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:
-rw-r--r--internal/gitaly/service/operations/merge.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go
index 79e1598e7..7303c4f1b 100644
--- a/internal/gitaly/service/operations/merge.go
+++ b/internal/gitaly/service/operations/merge.go
@@ -137,6 +137,10 @@ func (s *Server) UserMergeBranch(stream gitalypb.OperationService_UserMergeBranc
}
func validateFFRequest(in *gitalypb.UserFFBranchRequest) error {
+ if in.Repository == nil {
+ return fmt.Errorf("empty repository")
+ }
+
if len(in.Branch) == 0 {
return fmt.Errorf("empty branch name")
}