Products Resources Support About Us

Bitbucket PR Merge Issue

git

#1

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:

c.a.s.i.s.g.p.DefaultPullRequestAutoMergeStrategy CPDC/ci[6631]: Pull request 45@2 failed automatic merging: '/opt/git-2.19.0/bin/git merge -m Automatic merge --no-ff --no-log --allow-unrelated-histories cf734c8c560b13df7a76624b6296e4f75684f161' exited with code 0 saying: error: failed to encode 'NET#C/ciuba#c.cbl' from UTF-8 to ibm-1047

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?


#2

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?

Yes, that’s exactly the solution you need.

– Jerry