-
Notifications
You must be signed in to change notification settings - Fork 13
Working with RDASApp submodules
The RDASApp includes many JEDI components through submodules. This is good for a recursive git clone and we can easily navigate to corresponding component repositories on the GitHub code page by clicking links. However, this poses a problem that each "git status" or "git add" command will recursively traverse all submodules to find new changes and it greatly slow the responses of git operations, leaving an unpleasant user experiences.
Per the RDASApp policy, code changes in submodules should be committed to its own repository directly and the RDASApp only needs to point to a correct commit hash. Hence ignore=all
is added for all submodules (see issue #104 and PR#105) to speedup all git operations under the RDASApp repository.
Under this context, users will not be able to see the submodule changes when running git status
in RDASApp, but users can still stage (git add
) and commit if a submodule HEAD changes. Here are several quick useful commands/tips when dealing with RDASApp submodules:
-
check the submodule hashes in the submodule HEAD (e.g. the HEAD commit under sorc/ufo/ as if you run
git status
there):
git submodule status sorc/ufo
-
check the submodule hashes in the current RDASApp HEAD (e.g: the recorded hash in the RDASApp for the submodule sorc/ufo)
git ls-tree HEAD sorc/ufo
You may replace sorc/ufo with other submodules, such as sorc/mpas, sorc/saber, etc.
If hash1 and hash2 are different, it means the submodule has been checkout to a commit other than what is recorded in the RDASApp HEAD.
Usually, git will display a "+" sign before the output from git submodule status
to remind that submodules has been changed, e.g.:
[Jet|fe4 RDASApp]$ git ls-tree HEAD sorc/ufo
160000 commit 54b44b22291a90955c3eb5327ed24ea9e858d4f6 sorc/ufo
[Jet|fe4 RDASApp]$ git submodule status sorc/ufo
+b7acb2e6969db21d5ac07f68b10d451c88c8b2eb sorc/ufo (1.9.0-30-gb7acb2e6)
- update a submodule hash (using sorc/ufo as an example):
cd sorc/ufo
git checkout my_target_hash #a branch, tag or commit
cd ../..
git add sorc/ufo
git commit -m "update sorc/ufo to hash XXXXX"
git push