diff options
| author | Stan Hu <stanhu@gmail.com> | 2021-06-30 01:16:21 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2021-06-30 01:17:45 +0300 |
| commit | b19a10d3cac3d6642e307a313b6fa357ea2893c6 (patch) | |
| tree | 89317ee508727fb201bc6af96e52f877c7dc654b | |
| parent | 3acd12ba1a7fa1a497ef2b95bdce5671c4ce1e58 (diff) | |
Fix target ref logging in merge commit error message
Cast the protobuf byte string to a string, otherwise the value
appears as a base64-encoded message.
| -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") |