summaryrefslogtreecommitdiff
path: root/morphlib
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-04-12 17:31:11 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-04-12 17:31:11 +0100
commitf474282b188524f3830acb797404978af16fda8f (patch)
tree19eae5e1218f38dbbf4e5916ee92b9e359e695df /morphlib
parentf89cf55908dd3142e9249d17b5bdf1692ead4f60 (diff)
downloadmorph-f474282b188524f3830acb797404978af16fda8f.tar.gz
Remove final use of Treeish in submodules code
Diffstat (limited to 'morphlib')
-rw-r--r--morphlib/git.py6
-rw-r--r--morphlib/sourcemanager.py4
2 files changed, 6 insertions, 4 deletions
diff --git a/morphlib/git.py b/morphlib/git.py
index a639eab5..c37fe241 100644
--- a/morphlib/git.py
+++ b/morphlib/git.py
@@ -136,9 +136,9 @@ class MissingSubmoduleCommitError(cliapp.AppException):
class Submodules(object):
- def __init__(self, treeish, msg=logging.debug):
- self.repo = treeish.repo
- self.ref = treeish.ref
+ def __init__(self, repo, ref, msg=logging.debug):
+ self.repo = repo
+ self.ref = ref
self.msg = msg
self.submodules = []
diff --git a/morphlib/sourcemanager.py b/morphlib/sourcemanager.py
index 2747a2c9..a1a350ca 100644
--- a/morphlib/sourcemanager.py
+++ b/morphlib/sourcemanager.py
@@ -239,7 +239,9 @@ class SourceManager(object):
self.indent_more()
# resolve submodules
- treeish.submodules = morphlib.git.Submodules(treeish, self.msg)
+ treeish.submodules = morphlib.git.Submodules(treeish.repo,
+ treeish.ref,
+ self.msg)
try:
# load submodules from .gitmodules
treeish.submodules.load()