User Tools

  • Logged in as: anonymous (anonymous)
  • Log Out

Site Tools


mantisbt:git_submodules

This is an old revision of the document!


Working with Git Submodules in MantisBT

work-in-progress…

Some 3rd party libraries are stored and maintained in the MantisBT repository using [[http://git-scm.com/book/en/Git-Tools-Submodules|Git Submodules].

This setup requires some special handling when initializing the repository and when switching branches, especially to and from branches which do not (yet) have submodules in it.

The purpose of this page is to provide basic instructions to easily deal with commonly encountered issues.

Initializing the Repository

This is covered in the MantisBT Developer's Guide.

@@@TODO - update this when updated docbook has been merged with Master. Until then, copy/paste follows:

Switching Branches

With Submodules --> No Submodules

Checking out a branch with Submodules when the current branch does not have them.

@@@

No Submodules --> With Submodules

Checking out a branch without Submodules when the current branch has them.

$ git status
# On branch NoSubmodules
nothing to commit, working directory clean

$ git checkout WithSubmodules
M	library/adodb
M	library/phpmailer
Switched to branch 'WithSubmodules'

Solution

Use the following command to reset all Submodules to the state of their respective recorded commit:

git submodule foreach git checkout -- .

Submodules --> Submodules

Checking out a branch with Submodules when the current branch has the same submodules but pointing to a different commit.

@@@

mantisbt/git_submodules.1377904370.txt.gz · Last modified: 2013/08/30 19:35 (external edit)