diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2019-03-14 07:14:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-14 07:14:28 +0000 |
| commit | 834d308a2b9e4fa72e5e4ce424d5059e1b116370 (patch) | |
| tree | 41097f49d468b9489b909f8e6e9b24eb60a5036f | |
| parent | c18ee35da6ddb993739fafc8b06673c6d8554e35 (diff) | |
| parent | 41a26837d02f3b1c1603f8e59bfcd7483290880d (diff) | |
| download | git-repo-834d308a2b9e4fa72e5e4ce424d5059e1b116370.tar.gz | |
Merge "project: Relax the submodule name pattern to accept dots"
| -rwxr-xr-x | project.py | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -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] |