summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-11-05 11:14:40 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-11-05 11:14:40 +0000
commitecbaee8967cdf307fafe996c85025af96c1a70d6 (patch)
treeb826944f9c58f9bdf7589c112d4d76ecec8f4d19
parentac9e6787cd2b82bc37b9ba71d09d44aac71f85b1 (diff)
parent696e8e45e586b54e4fc634cab8d0f90c67fcf6a7 (diff)
downloadmorph-ecbaee8967cdf307fafe996c85025af96c1a70d6.tar.gz
Merge branch 'baserock/franred/check-for-commit-object-in-submodule-path'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-by: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
-rw-r--r--morphlib/git.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/git.py b/morphlib/git.py
index 70222acb..6a5a9a47 100644
--- a/morphlib/git.py
+++ b/morphlib/git.py
@@ -107,7 +107,7 @@ class Submodules(object):
# list objects in the parent repo tree to find the commit
# object that corresponds to the submodule
commit = gitcmd(self.app.runcmd, 'ls-tree', self.ref,
- submodule.name, cwd=self.repo)
+ submodule.path, cwd=self.repo)
# read the commit hash from the output
fields = commit.split()