>What does "re-encode any items in existing repositories" and "never use git 2.14.4 against the
>repository" mean for a repository with multiple clones and multiple branches?
There are multiple ways to "re-encode" the data in the repository, all of them painful in some way. For our team there were two areas to deal with-
1) The copyright character, which is encoded differently
2) Tool generated UTF-8 HTML, CSS, JS, etc data which was not properly identified in .gitattributes.
One of the steps in the process is to update the .gitattributes file so that all items get encoded appropriately in the local repository on checkout. There also were attributes in our original file that were not recognized/supported by the new git which had to be changed.
I would have liked to have done the same solution as Adam stated he did, exporting, converting, and importing all commits, as that leaves the repository totally consistent in the end. However the team decision was to identify the affected items, check them out using git 2.14, which re-encoded them from ISO-8859-1 to IBM-1047, and then forcing the affected items to be seen as updated and committed using the newer version of git (this was done using an earlier release 2.26.2) , which re-encoded them from IBM-1047 to UTF-8 in the repository. This had to be done for every branch in the repository that had not already been merged (but not yet deleted).
If I had to do it again, I would press for doing an export, convert, import as the way we did it sometimes causes issues during rebasing.
Once the corrected repository has been pushed to a remote server it is important that only a new version of git be used against all replicas which will be fetching/pulling/pushing commits to the repository so that data gets encoded as expected, both locally and on the server.
------------------------------
Greg Dyck
Internal - Rocket
Denver CO United States
------------------------------
Original Message:
Sent: 09-20-2021 19:08
From: Andrew Rowley
Subject: Free Open Mainframe Summit Event Tickets - share your z/OS Open Source Story
Was there ever an answer to this question about the git upgrade?
Open-source Languages & Tools for z/OS
What does "re-encode any items in existing repositories" and "never use git 2.14.4 against the repository" mean for a repository with multiple clones and multiple branches?
------------------------------
Andrew Rowley
Self Registered
Ballarat Australia
Original Message:
Sent: 09-20-2021 10:58
From: Greg Dyck
Subject: Free Open Mainframe Summit Event Tickets - share your z/OS Open Source Story
Adam.
What release of git are you using?
Rocket Software git for z/OS version 2.14.4 assumes the remote repository is encoded in ISO-8859-1, where-as git on other platforms assumes it is encoded in UTF-8. However, the current version of Rocket Software git for z/OS version 2.26.2, installed using MiniConda from repository https://anaconda.org/zoss-appdev/repo?type=conda&label=main, assumes the remote repository is encoded in UTF-8, the same as other platforms.
Moving from git 2.14.4 to git 2.26.2 with an existing repository has to be done carefully due to the encoding change. You must perform steps to re-encode any items in existing repositories that contain code points that encode differently in ISO-8859-1 vs UTF-8, and once you have done so you must never use git 2.14.4 against the repository.
------------------------------
Greg Dyck
Internal - Rocket
Denver CO United States
Original Message:
Sent: 09-17-2021 10:01
From: Adam Martin Britt
Subject: Free Open Mainframe Summit Event Tickets - share your z/OS Open Source Story
Hello,
We at BEC in Denmark are using Rocket open source tools on USS.
Our organisation is using bash and git. Personally, I am using vim.
We are currently migrating our source code to git. We have migrated to around 60 repositories and will migrate to around 350 repositories at project completion. This is a multi-year project, where much of the work is integrating existing systems to read from git. The biggest problems are reading from the unix filesystem instead of the MVS filesystem and codepage issues.
Best regards,
Adam Britt
------------------------------
Adam Martin Britt
IT-Architect
BEC
Randers SV Denmark
Original Message:
Sent: 09-16-2021 22:57
From: Dave Andrews
Subject: Free Open Mainframe Summit Event Tickets - share your z/OS Open Source Story
Next Wednesday and Thursday (September 22 & 23) is the Linux Foundation Open Mainframe Summit, and our own @Tatiana Balaburkina and @Vladimir Kudriakov are presenting! If you're attending don't miss their session, but if you are not we are offering free tickets ($50 value). Now here's the catch: we have at least 10 tickets but in order to receive one we need you to reply to this thread and tell us how you are using open-source tools on the mainframe.
What do we want to know? As much as you want to share. At a minimum tell us:
- What operating system you use the Rocket open source tools on
- Which tools you are using, and
- What processes/activities have you enabled. If you are still experimenting tell us how far you've gotten and where you want to get to (maybe we can help)
- Bonus points for sharing how this solution is benefitting your organization
It's that easy. We'll send you a promo code that can be immediately be used for registration.
------------------------------
Dave Andrews
Head of Customer Engagement
Rocket Software
South Salem NY United States
------------------------------