You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/03/01 16:58:05 UTC
[1/24] git commit: [#5785] ticket:277 Skip submodules when computing
git trees
[#5785] ticket:277 Skip submodules when computing git trees
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/c1413ead
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/c1413ead
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/c1413ead
Branch: refs/heads/cj/5411
Commit: c1413ead72d7a2680295ad1bbc868ec29db34666
Parents: c3f622e
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Feb 20 14:00:58 2013 +0000
Committer: Cory Johns <jo...@geek.net>
Committed: Tue Feb 26 17:53:43 2013 +0000
----------------------------------------------------------------------
Allura/allura/model/repo.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c1413ead/Allura/allura/model/repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repo.py b/Allura/allura/model/repo.py
index e44c483..4b922ac 100644
--- a/Allura/allura/model/repo.py
+++ b/Allura/allura/model/repo.py
@@ -428,6 +428,9 @@ class Tree(RepoObject):
obj = self.by_name[name]
if obj['type'] == 'blob':
return Blob(self, name, obj['id'])
+ if obj['type'] == 'submodule':
+ log.info('Skipping submodule "%s"' % name)
+ raise KeyError, name
obj = cache.get(Tree, dict(_id=obj['id']))
if obj is None:
oid = self.repo.compute_tree_new(self.commit, self.path() + name + '/')