From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Fri, 27 Jun 2014 05:36:29 +0000 (+0300)
Subject: GitRepository/has_submodules: add treeish argument
X-Git-Tag: tizen/0.6.15-20140828~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ff2be668d6650103633566f86bd2e297d84c4fc;p=tools%2Fgit-buildpackage.git

GitRepository/has_submodules: add treeish argument

For defining a Git treeish which to look into, instead of the current
working copy.

Change-Id: I27abd99f0416bd4300953d3c1bae2d99de3ab6c0
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index cd779152..6b21c252 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -1879,18 +1879,23 @@ class GitRepository(object):
 
 #{ Submodules
 
-    def has_submodules(self):
+    def has_submodules(self, treeish=None):
         """
         Does the repo have any submodules?
 
+        @param treeish: look into treeish
+        @type treeish: C{str}
         @return: C{True} if the repository has any submodules, C{False}
             otherwise
         @rtype: C{bool}
         """
-        if os.path.exists(os.path.join(self.path, '.gitmodules')):
+        if treeish:
+            try:
+                self.show('%s:.gitmodules' % treeish)
+            except GitRepositoryError:
+                return False
             return True
-        else:
-            return False
+        return os.path.exists(os.path.join(self.path, '.gitmodules'))
 
 
     def add_submodule(self, repo_path):