diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-05-23 00:30:02 +0000 |
|---|---|---|
| committer | Ariel Constenla-Haile <arielch@apache.org> | 2012-05-23 00:30:02 +0000 |
| commit | ab886ae8c08db36f6e6b81797e1d54f6c116510c (patch) | |
| tree | 024f127be91a6c09e0a1e8ce974631d58ad0dee9 /solenv/bin/modules | |
| parent | a7a15b9e04a722badf0070e0914e14cf6919dcb0 (diff) | |
Make retrieving the current SVN revision with git-svn work also in BRANCH
The current regular expression only works with a clone of a trunk
repository:
/^\s*git-svn-id:.*?trunk@([0-9]+)\s+/
This fails with the current AOO34 branch:
it does not match trunk@ because it's AOO34@
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'solenv/bin/modules')
| -rw-r--r-- | solenv/bin/modules/SvnRevision.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/modules/SvnRevision.pm b/solenv/bin/modules/SvnRevision.pm index 485849d6264e..3c13b94f91e7 100644 --- a/solenv/bin/modules/SvnRevision.pm +++ b/solenv/bin/modules/SvnRevision.pm @@ -36,7 +36,7 @@ sub DetectRevisionIdFromGit ($) # Not in a GIT repository. last; } - elsif (/^\s*git-svn-id:.*?trunk@([0-9]+)\s+/) + elsif (/^\s*git-svn-id:.*?@([0-9]+)\s+/) { $id = $1; last; |