diff options
author | Will Chandler <wchandler@gitlab.com> | 2022-07-20 18:12:00 +0300 |
---|---|---|
committer | Will Chandler <wchandler@gitlab.com> | 2022-07-20 18:12:00 +0300 |
commit | a3fe784ea748c52c280c5c9a5a47990c7a6ad95a (patch) | |
tree | 02961001233edc9d3923012c797f590c881ed049 /internal/git2go | |
parent | 1c907781819bf8810e15578f3d4d2b25e3ca1053 (diff) | |
parent | 4fca4bcdbfba0fc1a332bd922e60404cf3ff225c (diff) |
Merge branch 'pks-git-objectids-sha256' into 'master'
git: Encapsulate object hash specific information
See merge request gitlab-org/gitaly!4720
Diffstat (limited to 'internal/git2go')
-rw-r--r-- | internal/git2go/apply.go | 2 | ||||
-rw-r--r-- | internal/git2go/commit.go | 2 | ||||
-rw-r--r-- | internal/git2go/executor.go | 2 |
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) } |