Merge branch 'pks-git-objectids-sha256' into 'master'

git: Encapsulate object hash specific information

See merge request gitlab-org/gitaly!4720

3 files changed, 3 insertions, 3 deletions

diff --git a/internal/git2go/apply.go b/internal/git2go/apply.go
index 600890ca0..2bee12857 100644
--- a/internal/git2go/apply.go
+++ b/internal/git2go/apply.go
@@ -118,7 +118,7 @@ func (b *Executor) Apply(ctx context.Context, repo repository.GitRepo, params Ap
 		return "", result.Err
 	}
 
-	commitID, err := git.NewObjectIDFromHex(result.CommitID)
+	commitID, err := git.ObjectHashSHA1.FromHex(result.CommitID)
 	if err != nil {
 		return "", fmt.Errorf("could not parse commit ID: %w", err)
 	}
diff --git a/internal/git2go/commit.go b/internal/git2go/commit.go
index 068125d5b..13edb4faa 100644
--- a/internal/git2go/commit.go
+++ b/internal/git2go/commit.go
@@ -80,7 +80,7 @@ func (b *Executor) Commit(ctx context.Context, repo repository.GitRepo, params C
 		return "", result.Err
 	}
 
-	commitID, err := git.NewObjectIDFromHex(result.CommitID)
+	commitID, err := git.ObjectHashSHA1.FromHex(result.CommitID)
 	if err != nil {
 		return "", fmt.Errorf("could not parse commit ID: %w", err)
 	}
diff --git a/internal/git2go/executor.go b/internal/git2go/executor.go
index f1e594779..9524f03b1 100644
--- a/internal/git2go/executor.go
+++ b/internal/git2go/executor.go
@@ -123,7 +123,7 @@ func (b *Executor) runWithGob(ctx context.Context, repo repository.GitRepo, cmd
 		return "", fmt.Errorf("%s: %w", cmd, result.Err)
 	}
 
-	commitID, err := git.NewObjectIDFromHex(result.CommitID)
+	commitID, err := git.ObjectHashSHA1.FromHex(result.CommitID)
 	if err != nil {
 		return "", fmt.Errorf("could not parse commit ID: %w", err)
 	}