Merge pull request #30 from RightBrain-Networks/bugfix/len-expression

fix regex
2019-12-16 16:49:54 -05:00
parent 00cfeeca08 950cb4cb1f
commit 1726d247af
1 changed files with 3 additions and 3 deletions
--- a/semver/init.py
+++ b/semver/init.py
@ -65,9 +65,9 @@ class SemVer(object):
        print('Merged branch is ' + self.merged_branch)

        merged_prefix = None
-        matches = re.findall("[\/][^\/]+[\/]", self.merged_branch)
-        if len(matches) > 1:
-            merged_prefix = matches[0][1:-1]
+        matches = re.findall("[^\/]*/", self.merged_branch)
+        if len(matches) >= 1:
+            merged_prefix = matches[-1][0:-1]

        if merged_prefix:
            for prefix in self.major_branches: