diff options
Diffstat (limited to 'internal/gitaly/service/operations/cherry_pick.go')
| -rw-r--r-- | internal/gitaly/service/operations/cherry_pick.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/gitaly/service/operations/cherry_pick.go b/internal/gitaly/service/operations/cherry_pick.go index beca52822..53fc217ba 100644 --- a/internal/gitaly/service/operations/cherry_pick.go +++ b/internal/gitaly/service/operations/cherry_pick.go @@ -36,9 +36,9 @@ func (s *Server) UserCherryPick(ctx context.Context, req *gitalypb.UserCherryPic return nil, structerr.NewInternal("has branches: %w", err) } - committerDate := time.Now() - if req.Timestamp != nil { - committerDate = req.Timestamp.AsTime() + committerDate, err := dateFromProto(req) + if err != nil { + return nil, structerr.NewInvalidArgument("%w", err) } cherryCommit, err := quarantineRepo.ReadCommit(ctx, git.Revision(req.Commit.Id)) |