diff options
Diffstat (limited to 'internal/git/log/commit.go')
| -rw-r--r-- | internal/git/log/commit.go | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/internal/git/log/commit.go b/internal/git/log/commit.go index 421bfd59c..282a54404 100644 --- a/internal/git/log/commit.go +++ b/internal/git/log/commit.go @@ -13,6 +13,7 @@ import ( "gitlab.com/gitlab-org/gitaly/internal/git" "gitlab.com/gitlab-org/gitaly/internal/git/catfile" "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" ) @@ -24,11 +25,18 @@ func GetCommit(ctx context.Context, repo *gitalypb.Repository, revision string) return nil, err } - return GetCommitCatfile(c, revision) + return GetCommitCatfile(ctx, c, revision) } // GetCommitCatfile looks up a commit by revision using an existing *catfile.Batch instance. -func GetCommitCatfile(c *catfile.Batch, revision string) (*gitalypb.GitCommit, error) { +func GetCommitCatfile(ctx context.Context, c *catfile.Batch, revision string) (*gitalypb.GitCommit, error) { + if featureflag.IsEnabled(ctx, featureflag.CommitWithoutBatchCheck) { + return getCommitCatfileNew(c, revision) + } + return getCommitCatfileOld(c, revision) +} + +func getCommitCatfileOld(c *catfile.Batch, revision string) (*gitalypb.GitCommit, error) { info, err := c.Info(revision + "^{commit}") if err != nil { return nil, err @@ -42,6 +50,15 @@ func GetCommitCatfile(c *catfile.Batch, revision string) (*gitalypb.GitCommit, e return parseRawCommit(r, info) } +func getCommitCatfileNew(c *catfile.Batch, revision string) (*gitalypb.GitCommit, error) { + obj, err := c.Commit(revision + "^{commit}") + if err != nil { + return nil, err + } + + return parseRawCommit(obj.Reader, &obj.ObjectInfo) +} + // GetCommitMessage looks up a commit message and returns it in its entirety. func GetCommitMessage(c *catfile.Batch, repo *gitalypb.Repository, revision string) ([]byte, error) { info, err := c.Info(revision + "^{commit}") |