Search code examples
gitgit-branchgit-submodulesgit-remote

Git submodule to track remote branch


I'm trying to use git submodules for aggregating 10+ repositories into one structure for easy development.

It is supposed to clone the module and checkout a branch. Instead, the module is checked out in detached head mode.

git clone [email protected]:org/global-repository.git
git submodule update —init
cd config-framework
git status

$git status
#HEAD detached at b932ab5
nothing to commit, working directory clean

gitmodules files seems to be okay

$cat .gitmodules 
[submodule "config-framework"]
        path = config-framework
        url = [email protected]:org/config-framework.git
        branch = MY_BRANCH

We want the MY_BRANCH branch to be checked out by default, rather than detached head. How do we achieve that?


Solution

  • Submodules are always checked out in a detached HEAD mode.

    That is because a submodule will checkout the SHA1 stored in the special entry in the index of the parent repo.

    Plus, if you want a submodule to follow the branch you have registered in the .gitmodules, you need:

    git submodule update --init --remote
    

    The --remote will make a git fetch, plus a checkout of the new HEAD.
    Alas, even that checkout will be of a commit, not of the branch (since you have no local branch by default in a submodule), so... back to a detached HEAD mode.
    See more at "Git submodules: Specify a branch/tag".

    You can try (not tested) a:

    git submodule foreach 'git checkout -b $(git config -f /path/to/parent/repo/.gitmodules --get submodule.$path.branch)'
    

    I take advantage of the fact git submodule foreach has access to '$path', the name of the submodule directory relative to the superproject.


    There was an attempt to specify a branch for a submodule to be automatically checked out in (commit 23d25e4 for Git 2.0).... but it got reversed (commit d851ffb, April 2d 2014)!
    It might come soon, but not in its current implementation.


    June 2024: user368683 suggests in the comments:

    When run in the root of the parent repository, this command does not need an adaptation:

    git submodule foreach --recursive "git config -f $(pwd)/.gitmodules --get submodule.\$path.branch"

    True: $(pwd) (in the context of git submodule foreach command) is evaluated once from the context where the command is run (the parent repository's root).
    It always correctly points to the parent's .gitmodules file without needing further adaptation for different submodule paths.