Commit bb3300a8 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Use existing 'branch' key for submodule updates

parent a1290e0a

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ update submodules: 
  script:

    - |

      git submodule foreach --recursive '

        branch=`git config -f ~/.gitmodules submodule.${name}.auto-update`;

        branch=`git config -f ~/.gitmodules submodule.${name}.branch`;

        git checkout origin/${branch:-HEAD} || exit 1

        (cd ${toplevel}; exec git add ${path})

      '

.gitmodules

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
[submodule ".vim/bundle/vim-gnupg"]

	path = .vim/bundle/vim-gnupg

	url = https://github.com/jamessan/vim-gnupg.git

	branch = main

[submodule ".vim/bundle/vim-pathogen"]

	path = .vim/bundle/pathogen

	url = https://github.com/tpope/vim-pathogen.git