add git fleximod support to .gitmodules #466
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 regulargit submodule update
command. If then afx...
(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 ofgit fleximod
(thefx...
entries). This can lead to divergent versions to be used, if not taken care of manually (I kind of miss agit 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 regulargit submodule
.Closes #465