Web lists-archives.com

git projects with submodules in different sites - in txt format (:+(


I am getting out of idea about how to change the methodology we are using in order to ease our integration process... Close to despair, I am throwing the question to you...

We have 6 infrastructure repositories.
Each project is composed of 4 repositories, each one using one or two infrastructure repositories as sub-modules. (Not the same)

The infrastructure repositories are common to several projects and in the case we have to make change in the infrastructure for a specific project, we are doing it on a specific branch until properly merged.

Everything is fine (more or less) and somehow working.

Now, we have one project that will be developed in another site and with another git server physically separated from the main site.

I copied the infrastructure repositories in the new site and removed and add the sub-modules in order for them to point to the url in the separated git server.

Every 2 weeks, the remotely developed code has to be integrated back in the main site. 
My idea was to format GIT patches, integrate in the main site, tag the whole thing and ship back the integrated tagged code to the remote site.
... and now the nightmare starts:

Since the .gitmodules is different, I cannot have the same SHA and then same tag and I am never sure that the integrated code is proper.

May be there is a simple solution that I don't know about to my problem? Is there something else than GIT patches? Should I simply ship to the remote site the code as is and change the submodules each time?

Thanks a lot for trying to help me,


*********************************************************************************************** Please consider the environment before printing this email ! The information contained in this communication is proprietary to Israel Aerospace Industries Ltd. and/or third parties, may contain confidential or privileged information, and is intended only for the use of the intended addressee thereof. If you are not the intended addressee, please be aware that any use, disclosure, distribution and/or copying of this communication is strictly prohibited. If you receive this communication in error, please notify the sender immediately and delete it from your computer. Thank you. Visit us at: www.iai.co.il