From 69507569256fb1816168bb089d843162c5176b61 Mon Sep 17 00:00:00 2001
From: Joseph Manley <j@cloudsumu.com>
Date: Thu, 18 Jul 2019 15:16:25 -0400
Subject: [PATCH] Check for alternative GitHub branch name combos

---
 semver/__init__.py | 14 +++++++++++---
 test.txt           |  1 -
 2 files changed, 11 insertions(+), 4 deletions(-)
 delete mode 100644 test.txt

diff --git a/semver/__init__.py b/semver/__init__.py
index f2a3618..e134af6 100644
--- a/semver/__init__.py
+++ b/semver/__init__.py
@@ -61,16 +61,24 @@ class SemVer(object):
     # based on branches involved see what type of versioning should be done
     def get_version_type(self):
         print('Merged branch is ' + self.merged_branch)
+
+ 
+        #Get GitHub repo's owner from url
+        repoOwner = None
+        remoteUrl = subprocess.Popen(['git', 'config', '--get', 'remote.origin.url'], stdout=subprocess.PIPE).stdout.read().decode('utf-8').rstrip()
+        if "github.com" in remoteUrl:
+            repoOwner = re.search("(?<=github.com(:|\/))(.*)(?=\/.*.git)", remoteUrl).group(0)
+
         for prefix in self.major_branches:
-            if self.merged_branch.startswith(prefix + '/'):
+            if self.merged_branch.startswith(prefix + '/') or self.merged_branch.startswith(str(repoOwner) + '/' + prefix + '/'):
                 self.version_type = 'major'
                 return True
         for prefix in self.minor_branches:
-            if self.merged_branch.startswith(prefix + '/'):
+            if self.merged_branch.startswith(prefix + '/') or self.merged_branch.startswith(str(repoOwner) + '/' + prefix + '/'):
                 self.version_type = 'minor'
                 return True
         for prefix in self.patch_branches:
-            if self.merged_branch.startswith(prefix + '/'):
+            if self.merged_branch.startswith(prefix + '/') or self.merged_branch.startswith(str(repoOwner) + '/' + prefix + '/'):
                 self.version_type = 'patch'
                 return True
         return False
diff --git a/test.txt b/test.txt
deleted file mode 100644
index 718f4d2..0000000
--- a/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-t