Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 16B3AE414 for ; Fri, 1 Mar 2013 20:08:01 +0000 (UTC) Received: (qmail 4007 invoked by uid 500); 1 Mar 2013 20:08:01 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 3939 invoked by uid 500); 1 Mar 2013 20:08:00 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 3726 invoked by uid 99); 1 Mar 2013 20:08:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Mar 2013 20:08:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 65F113BA4F; Fri, 1 Mar 2013 20:08:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [15/26] git commit: [#5411] ticket:282 Skip git submodules when computing trees Message-Id: <20130301200800.65F113BA4F@tyr.zones.apache.org> Date: Fri, 1 Mar 2013 20:08:00 +0000 (UTC) [#5411] ticket:282 Skip git submodules when computing 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/9be52732 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/9be52732 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/9be52732 Branch: refs/heads/cj/5854 Commit: 9be5273272b00e7fedd8ab0df989c44238e6ebe2 Parents: 92885fc Author: Igor Bondarenko Authored: Tue Feb 26 09:27:44 2013 +0000 Committer: Cory Johns Committed: Fri Mar 1 15:57:39 2013 +0000 ---------------------------------------------------------------------- ForgeGit/forgegit/model/git_repo.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9be52732/ForgeGit/forgegit/model/git_repo.py ---------------------------------------------------------------------- diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py index a659ed5..092d24d 100644 --- a/ForgeGit/forgegit/model/git_repo.py +++ b/ForgeGit/forgegit/model/git_repo.py @@ -238,6 +238,8 @@ class GitImplementation(M.RepositoryImplementation): blob_ids=[], other_ids=[])) for o in tree: + if o.type == 'submodule': + continue obj = Object( name=h.really_unicode(o.name), id=o.hexsha)