![]() It doesn't matter why the submodule's checked out HEAD commit ID changed both pulling a new version of the submodule (via, e.g., git pull in the submodule directory) or by locally committing in the submodule directory do the same thing - change the submodule HEAD commit ID by adding more commits - as far as the parent project is concerned. If you do a git diff, you'll see the changed commit ID (your IDs will of course be different): $ git diff Git is telling you that the HEAD commit ID of the submodule has changed, and that you can commit that change to the parent project. On checkout, it makes sure to grab that particular version of the submodule if it didn't, you could wind up with an incompatible version of a submodule when checking out an old version of your code. To make sense of that, you need to know that when you put a submodule in your project that git tracks not just where it was cloned from but also the most recent (or chosen) commit ID of that submodule (i.e., its HEAD). No changes added to commit (use "git add" and/or "git commit -a") " to discard changes in working directory) ![]() Your branch is up to date with 'origin/master'. The integration with Ceph can be tested localy by modifying the URL of the upstream from the ceph namespace to the location where the pull request is waiting to be reviewed:ĭiff -git a/.gitmodules b/.gitmodules index b51c509.e22aaac 100644 - a/.gitmodules +++ b/.I think what you're seeing is something like this: $ git status Git checkout -b wip-compilation-warnings-v2 jimplank/v2 git cherry-pick -x da3b767 git push loic wip-compilation-warnings-v2 When merged into master, the commits are backported to the stable branch v2: Switched to a new branch 'wip-compilation-warnings' git branch -vv * wip-compilation-warnings 87f3010 remove unused variablesĪnd a pull request is sent upstream. $ git checkout -b wip-compilation-warnings jimplank/master Branch wip-compilation-warnings set up to track remote branch master from jimplank. ![]() $ git remote add loic $ git remote -vv ceph (fetch) ceph (push) jimplank (fetch) jimplank (push) loic (fetch) loic (push)Ī local branch wip-compilation-warnings is created from the upstream master branch jimplank/master. To work with jerasure upstream, three remotes are defined : one for the upstream ( jimplank read only), one for a fork of the upstream at a location suitable to issue a pull request ( loic read-write), one for the mirror from the ceph ( ceph read-write). When checking out a branch with the new submodules, it is necessary to update them to clone and checkout the required branch. Git submodule add -b v1 src/erasure-code/jerasure/gf-complete git submodule add -b v2 src/erasure-code/jerasure/jerasure As mentioned on Gitlab documentation, If the submodules are on the same git server, I should use relative path Using absolute path (HTTPS) doesnt work. The git submodules point to these release branches as follows: Git submodule update from CI with access token Ask Question Asked Viewed 29 times CI/CD Collective 0 I am trying to update git submodules from. Copies of the repositories were created in the ceph namespace for both jerasure and gf-complete.Ī stable branch was created for jerasure v2 and gf-complete v1. If a change needs to be made urgently (shortly before a Ceph release for instance), it may be inconvenient to wait for a pull request to be reviewed and merged. The copy was removed from the Ceph repository and replaced by git submodules to decouple the release cycles. They were copied in Ceph in 2013 because there were no reference repositories at the time. The gf-complete and jerasure libraries implement the erasure code functions used in Ceph.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |