summaryrefslogtreecommitdiffstats
path: root/git_superproject.py
diff options
context:
space:
mode:
Diffstat (limited to 'git_superproject.py')
-rw-r--r--git_superproject.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/git_superproject.py b/git_superproject.py
index dad6a3de..3c4144dd 100644
--- a/git_superproject.py
+++ b/git_superproject.py
@@ -28,6 +28,7 @@ import sys
28 28
29from git_command import git_require, GitCommand 29from git_command import git_require, GitCommand
30from git_refs import R_HEADS 30from git_refs import R_HEADS
31from manifest_xml import LOCAL_MANIFEST_GROUP_PREFIX
31 32
32_SUPERPROJECT_GIT_NAME = 'superproject.git' 33_SUPERPROJECT_GIT_NAME = 'superproject.git'
33_SUPERPROJECT_MANIFEST_NAME = 'superproject_override.xml' 34_SUPERPROJECT_MANIFEST_NAME = 'superproject_override.xml'
@@ -268,6 +269,9 @@ class Superproject(object):
268 path = project.relpath 269 path = project.relpath
269 if not path: 270 if not path:
270 continue 271 continue
272 # Skip the project if it comes from local manifest.
273 if any(s.startswith(LOCAL_MANIFEST_GROUP_PREFIX) for s in project.groups):
274 continue
271 commit_id = commit_ids.get(path) 275 commit_id = commit_ids.get(path)
272 if commit_id: 276 if commit_id:
273 project.SetRevisionId(commit_id) 277 project.SetRevisionId(commit_id)