summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Schuberth <sschuberth@gmail.com>2019-03-11 13:53:38 +0100
committerSebastian Schuberth <sschuberth@gmail.com>2019-03-11 13:53:38 +0100
commit41a26837d02f3b1c1603f8e59bfcd7483290880d (patch)
treee1f317d7810790a9e1cf45338cdcae26e159624b
parente7379dc5f75f4c331c16b4199904dc98ee858e5f (diff)
downloadgit-repo-41a26837d02f3b1c1603f8e59bfcd7483290880d.tar.gz
project: Relax the submodule name pattern to accept dots
Even if dots are used as separators for Git config keys, they are not forbidden as part of submodule names. This fixes the issue of submodules with a name like e.g. "long.js" to be skipped from checkout. Change-Id: I77da07925ad207fa3d043067dfbbcb4a1ebdac4d
-rwxr-xr-xproject.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/project.py b/project.py
index 77a4f571..274241e1 100755
--- a/project.py
+++ b/project.py
@@ -1807,8 +1807,8 @@ class Project(object):
1807 submodules.append((sub_rev, sub_path, sub_url)) 1807 submodules.append((sub_rev, sub_path, sub_url))
1808 return submodules 1808 return submodules
1809 1809
1810 re_path = re.compile(r'^submodule\.([^.]+)\.path=(.*)$') 1810 re_path = re.compile(r'^submodule\.(.+)\.path=(.*)$')
1811 re_url = re.compile(r'^submodule\.([^.]+)\.url=(.*)$') 1811 re_url = re.compile(r'^submodule\.(.+)\.url=(.*)$')
1812 1812
1813 def parse_gitmodules(gitdir, rev): 1813 def parse_gitmodules(gitdir, rev):
1814 cmd = ['cat-file', 'blob', '%s:.gitmodules' % rev] 1814 cmd = ['cat-file', 'blob', '%s:.gitmodules' % rev]