From ab886ae8c08db36f6e6b81797e1d54f6c116510c Mon Sep 17 00:00:00 2001 From: Ariel Constenla-Haile Date: Wed, 23 May 2012 00:30:02 +0000 Subject: 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@ --- solenv/bin/modules/SvnRevision.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') 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; -- cgit