diff options
| author | James Fargher <proglottis@gmail.com> | 2021-06-30 06:24:14 +0300 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2021-06-30 06:24:14 +0300 |
| commit | d5777441938369d512a7825c57ccf6115d7afdfa (patch) | |
| tree | 2880a9515af1cee1a72b01e0c15ff1937aaa9fcb | |
| parent | daa616a17b06c875551d70b8644f013a1d4c361b (diff) | |
| parent | b19a10d3cac3d6642e307a313b6fa357ea2893c6 (diff) | |
Merge branch 'sh-fix-target-ref-logging' into 'master'
Fix target ref logging in merge commit error message
See merge request gitlab-org/gitaly!3627
| -rw-r--r-- | internal/gitaly/service/operations/merge.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go index 39b397e92..ff9c3f42a 100644 --- a/internal/gitaly/service/operations/merge.go +++ b/internal/gitaly/service/operations/merge.go @@ -305,7 +305,7 @@ func (s *Server) UserMergeToRef(ctx context.Context, request *gitalypb.UserMerge logrus.Fields{ "source_sha": sourceOID, "target_sha": oid, - "target_ref": request.TargetRef, + "target_ref": string(request.TargetRef), }, ).Error("unable to create merge commit") |