diff options
Diffstat (limited to 'internal/git/catfile/object_content_reader.go')
| -rw-r--r-- | internal/git/catfile/object_content_reader.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/internal/git/catfile/object_content_reader.go b/internal/git/catfile/object_content_reader.go index 0af762077..cae06623d 100644 --- a/internal/git/catfile/object_content_reader.go +++ b/internal/git/catfile/object_content_reader.go @@ -9,6 +9,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "gitlab.com/gitlab-org/gitaly/v16/internal/command" + "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" "gitlab.com/gitlab-org/gitaly/v16/internal/git" ) @@ -59,6 +60,10 @@ func newObjectContentReader( flags = append(flags, git.Flag{Name: "-Z"}) } + if featureflag.MailmapOptions.IsEnabled(ctx) { + flags = append([]git.Option{git.Flag{Name: "--use-mailmap"}}, flags...) + } + batchCmd, err := repo.Exec(ctx, git.Command{ Name: "cat-file", |