Merge pull request openSUSE#1848 from openSUSE/git_store_custom_origin

Fix non-default origin

Author: dmach

behave/features/git-repo-clone.feature

@@ -27,6 +27,16 @@ Scenario: Clone a git repo
         """
 
 
+@destructive
+Scenario: Clone and build with non-default origin
+    When I execute git-obs with args "repo clone pool/test-GitPkgA --no-ssh-strict-host-key-checking"
+    Then the exit code is 0
+    When I set working directory to "{context.osc.temp}/test-GitPkgA"
+     And I execute "git remote rename origin myorigin"
+     And I execute osc with args "build --just-print-buildroot --alternative-project test:factory"
+    Then the exit code is 0
+
+
 @destructive
 Scenario: Clone a git repo via http
    Given I execute git-obs with args "api -X PATCH /repos/pool/test-GitPkgA/ --data '{{"private": true}}'"

osc/git_scm/store.py

@@ -235,7 +235,7 @@ def project(self):
 
                 if not self._project:
                     # read project from Gitea (identical owner, repo: _ObsPrj, file: project.build)
-                    origin = self._run_git(["remote", "get-url", "origin"])
+                    origin = self._run_git(["remote", "get-url", self.current_remote])
                     self._project = self.get_build_project(origin)
 
             else:
@@ -261,7 +261,7 @@ def project(self, value):
     @property
     def package(self):
         if self._package is None:
-            origin = self._run_git(["remote", "get-url", "origin"])
+            origin = self._run_git(["remote", "get-url", self.current_remote])
             self._package = Path(urllib.parse.urlsplit(origin).path).stem
         return self._package
 
@@ -328,6 +328,20 @@ def last_buildroot(self, value):
     @property
     def scmurl(self):
         try:
-            return self._run_git(["remote", "get-url", "origin"])
+            return self._run_git(["remote", "get-url", self.current_remote])
         except subprocess.CalledProcessError:
             return None
+
+    @property
+    def current_remote(self):
+        result = None
+        try:
+            result = self._run_git(["rev-parse", "--abbrev-ref", "@{u}"])
+            if result:
+                result = result.split("/")[0]
+        except subprocess.CalledProcessError:
+            pass
+
+        if result:
+            return result
+        return "origin"