Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add git fleximod support to .gitmodules #466

Merged
merged 1 commit into from
Jan 17, 2025

Conversation

jmaerz
Copy link
Collaborator

@jmaerz jmaerz commented Jan 17, 2025

Hi @TomasTorsvik , @matsbn , @JorgSchwinger ,
This PR add full fleximod support for both, CVMIX and M4AGO submodules.

One thing to note:
git fleximod seems to first check the regular git submodule update command. If then a fx... (git fleximod) entry is found in the .gitmodules file, it supersedes the submodule version that is committed via a regular git command (if they are different from each other). Hence, one needs to take care, which command to run when, if the regular git committed change in the submodule is not identical to the tag/branch entry of git fleximod (the fx... entries). This can lead to divergent versions to be used, if not taken care of manually (I kind of miss a git fleximod update-to-regular-git-submodule command to not having to manually edit the .gitmodules file, when committing submodule changes...).
I currently made the entries identical between git fleximod and the regular git submodule.

Closes #465

@jmaerz jmaerz added this to the release v1.7.0 tag milestone Jan 17, 2025
@jmaerz jmaerz requested a review from TomasTorsvik January 17, 2025 12:38
@jmaerz jmaerz self-assigned this Jan 17, 2025
@jmaerz jmaerz mentioned this pull request Jan 17, 2025
17 tasks
Copy link
Contributor

@TomasTorsvik TomasTorsvik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmaerz - thanks for taking care of this!

@jmaerz jmaerz merged commit b039f55 into NorESMhub:master Jan 17, 2025
4 checks passed
@jmaerz jmaerz deleted the BLOM-add-fleximod-entry branch January 17, 2025 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

git fleximod support for submodules in BLOM (?)
2 participants