zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fetch git submodules recursively (#3779)

Browse Source 
* fetch git submodules recursively

This is useful if the submodules have submodules themselves. On
the other hand doing a recursive update doesn't hurt if there
is only one level.

* fetch submodules with depth=1 as well (fix #2190)

* use git submodule with depth only for git>=1.8.4
This commit is contained in:
Christoph Junghans 2017-04-21 22:59:30 -06:00 committed by Todd Gamblin
parent 4572685710
commit 0b002c2911
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/spack/docs/packaging_guide.rst
View File

@ -854,7 +854,7 @@ Git fetching is enabled with the following parameters to ``version``:
* ``tag``: name of a tag to fetch.
* ``branch``: name of a branch to fetch.
* ``commit``: SHA hash (or prefix) of a commit to fetch.
* ``submodules``: Also fetch submodules when checking out this repository.
* ``submodules``: Also fetch submodules recursively when checking out this repository.
Only one of ``tag``, ``branch``, or ``commit`` can be used at a time.
@ -917,7 +917,8 @@ Commits
Submodules
You can supply ``submodules=True`` to cause Spack to fetch submodules
along with the repository at fetch time.
recursively along with the repository at fetch time. For more information
about git submodules see the manpage of git: ``man git-submodule``.
.. code-block:: python

14
lib/spack/spack/fetch_strategy.py
View File

@ -686,10 +686,20 @@ def fetch(self):
# Init submodules if the user asked for them.
if self.submodules:
# only git 1.8.4 and later have --depth option
if self.git_version < ver('1.8.4'):
if spack.debug:
self.git('submodule', 'update', '--init')
self.git('submodule', 'update', '--init', '--recursive')
else:
self.git('submodule', '--quiet', 'update', '--init')
self.git('submodule', '--quiet', 'update', '--init',
'--recursive')
else:
if spack.debug:
self.git('submodule', 'update', '--init', '--recursive',
'--depth=1')
else:
self.git('submodule', '--quiet', 'update', '--init',
'--recursive', '--depth=1')
def archive(self, destination):
super(GitFetchStrategy, self).archive(destination, exclude='.git')