operations: Use proper types for `fetchStartRevision()`

Convert `fetchStartRevision()` to return a typed `git.ObjectID` instead
of a plain string.

2 files changed, 7 insertions, 7 deletions

diff --git a/internal/gitaly/service/operations/cherry_pick.go b/internal/gitaly/service/operations/cherry_pick.go
index ac0f9c74c..eaf2f5015 100644
--- a/internal/gitaly/service/operations/cherry_pick.go
+++ b/internal/gitaly/service/operations/cherry_pick.go
@@ -67,7 +67,7 @@ func (s *Server) userCherryPick(ctx context.Context, req *gitalypb.UserCherryPic
 		AuthorMail: string(req.User.Email),
 		Message:    string(req.Message),
 		Commit:     req.Commit.Id,
-		Ours:       startRevision,
+		Ours:       startRevision.String(),
 		Mainline:   mainline,
 	}.Run(ctx, s.cfg)
 	if err != nil {
@@ -96,7 +96,7 @@ func (s *Server) userCherryPick(ctx context.Context, req *gitalypb.UserCherryPic
 	}
 
 	if req.DryRun {
-		newrev = startRevision
+		newrev = startRevision.String()
 	}
 
 	if !branchCreated {
diff --git a/internal/gitaly/service/operations/revert.go b/internal/gitaly/service/operations/revert.go
index ce8a0d493..744bf22a5 100644
--- a/internal/gitaly/service/operations/revert.go
+++ b/internal/gitaly/service/operations/revert.go
@@ -60,7 +60,7 @@ func (s *Server) UserRevert(ctx context.Context, req *gitalypb.UserRevertRequest
 		AuthorMail: string(req.User.Email),
 		AuthorDate: authorDate,
 		Message:    string(req.Message),
-		Ours:       startRevision,
+		Ours:       startRevision.String(),
 		Revert:     req.Commit.Id,
 		Mainline:   mainline,
 	}.Run(ctx, s.cfg)
@@ -89,7 +89,7 @@ func (s *Server) UserRevert(ctx context.Context, req *gitalypb.UserRevertRequest
 	}
 
 	if req.DryRun {
-		newrev = startRevision
+		newrev = startRevision.String()
 	}
 
 	if !branchCreated {
@@ -145,7 +145,7 @@ type requestFetchingStartRevision interface {
 	GetStartBranchName() []byte
 }
 
-func (s *Server) fetchStartRevision(ctx context.Context, req requestFetchingStartRevision) (string, error) {
+func (s *Server) fetchStartRevision(ctx context.Context, req requestFetchingStartRevision) (git.ObjectID, error) {
 	startBranchName := req.GetStartBranchName()
 	if len(startBranchName) == 0 {
 		startBranchName = req.GetBranchName()
@@ -166,7 +166,7 @@ func (s *Server) fetchStartRevision(ctx context.Context, req requestFetchingStar
 	}
 
 	if req.GetStartRepository() == nil {
-		return startRevision.String(), nil
+		return startRevision, nil
 	}
 
 	_, err = localrepo.New(s.gitCmdFactory, req.GetRepository(), s.cfg).ResolveRevision(ctx, startRevision.Revision()+"^{commit}")
@@ -178,5 +178,5 @@ func (s *Server) fetchStartRevision(ctx context.Context, req requestFetchingStar
 		return "", helper.ErrInvalidArgumentf("resolve start: %w", err)
 	}
 
-	return startRevision.String(), nil
+	return startRevision, nil
 }