The following is for git repos on z/OS using git for z version 2.3.5. Our enterprise remote server is bitbucket v5.16.0 as of this writing.

We are currently having encoding issues with bitbucket during PR merges; it is trying to encode from UTF-8 to ibm-1047 and failing, blocking any PR’s from being merged. An extract from our bitbucket logs:

This issue was not present before and only began cropping up recently. Could this have something to do with the “working-tree-encoding” attribute now being used by distributed platforms like bitbucket server, and trying to convert to IBM-1047 on bitbucket server?

We are currently running git 2.3.5 which does not have the “zos-working-tree-encoding”. Could upgrading to 2.14.4 fix this by migrating to the “zos-working-tree-encoding” attribute?