ARTbio / GalaxyKickStart

Ansible playbooks for Galaxy Server deployment
GNU General Public License v3.0
24 stars 22 forks source link

Update submodule #168

Closed drosofff closed 8 years ago

drosofff commented 8 years ago

should we update the galaxy-os submodule using

or

?

mvdbeek commented 8 years ago

git submodule update --remote

Didn't know this shortcut:

       --remote
           This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the
           submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote
           (branch.<name>.remote), defaulting to origin. The remote branch used defaults to master, but the branch name may
           be overridden by setting the submodule.<name>.branch option in either .gitmodules or .git/config (with .git/config
           taking precedence).

           This works for any of the supported update procedures (--checkout, --rebase, etc.). The only change is the source
           of the target SHA-1. For example, submodule update --remote --merge will merge upstream submodule changes into the
           submodules, while submodule update --merge will merge superproject gitlink changes into the submodules.

           In order to ensure a current tracking branch state, update --remote fetches the submodule's remote repository
           before calculating the SHA-1. If you don't want to fetch, you should use submodule update --remote --no-fetch.

           Use this option to integrate changes from the upstream subproject with your submodule's current HEAD.
           Alternatively, you can run git pull from the submodule, which is equivalent except for the remote branch name:
           update --remote uses the default upstream repository and submodule.<name>.branch, while git pull uses the
           submodule's branch.<name>.merge. Prefer submodule.<name>.branch if you want to distribute the default upstream
           branch with the superproject and branch.<name>.merge if you want a more native feel while working in the submodule
           itself.

So yeah, that seems like the way to go. You checkout a new branch in the ansible-artimed repo, then git submodule update --remote, then a PR.