Skip to content

Commit cd78a5c

Browse files
authored
Merge pull request #54 from bwbarrett/bugfix/support-git-submodules-with-relative-paths
nightly: Support relative submodule paths
2 parents 5e798c4 + 8dbd44e commit cd78a5c

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

nightly-tarball/Builder.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,12 +376,11 @@ def prepare_source_tree(self):
376376
# origin/<branch>/HEAD
377377
self._logger.debug("Switching to branch: " + branch)
378378
if not branch in repo.heads:
379-
# TODO: Can we avoid calling into repo.git here?
380-
repo.git.checkout('origin/' + branch, b=branch)
381-
repo.head.reference = repo.refs['origin/' + branch]
379+
repo.git.checkout(branch)
380+
repo.head.reference = repo.refs[branch]
382381

383382
# And pull in all the right submodules
384-
repo.submodule_update(recursive = True)
383+
repo.git.submodule('update', '--init', '--recursive')
385384

386385
# wish I could figure out how to do this without resorting to
387386
# shelling out to git :/

0 commit comments

Comments
 (0)