From ace74b5ef5f5a3923e83333ebca04c65a13d2a5d Mon Sep 17 00:00:00 2001
From: Joseph Manley <j@cloudsumu.com>
Date: Thu, 18 Jul 2019 14:36:22 -0400
Subject: [PATCH 1/4] Add test stage

---
 Jenkinsfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7e8554a..6039dab 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -53,6 +53,13 @@ pipeline {
         }
       }
     }
+    stage('Test')
+    {
+      steps
+      {
+        sh('git log -1')
+      }
+    }
     stage('Build') {
       steps {
 

From 3881935fc4650a76e9b1b429f53491880aca8180 Mon Sep 17 00:00:00 2001
From: Joseph Manley <j@cloudsumu.com>
Date: Thu, 18 Jul 2019 14:38:35 -0400
Subject: [PATCH 2/4] Test merge

---
 test.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 test.txt

diff --git a/test.txt b/test.txt
new file mode 100644
index 0000000..718f4d2
--- /dev/null
+++ b/test.txt
@@ -0,0 +1 @@
+t

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 3/4] 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

From 8dfd0592339a232164e3f04c7e04ea47623cac7c Mon Sep 17 00:00:00 2001
From: Joseph Manley <j@cloudsumu.com>
Date: Thu, 18 Jul 2019 15:28:06 -0400
Subject: [PATCH 4/4] Remove test stage

---
 Jenkinsfile | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6039dab..7e8554a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -53,13 +53,6 @@ pipeline {
         }
       }
     }
-    stage('Test')
-    {
-      steps
-      {
-        sh('git log -1')
-      }
-    }
     stage('Build') {
       steps {