🔀 Merge pull request #211 from retigra/git-faulty-base-branches

🐛 Using non-default branches results in conflicts as branches are frequently based of default branch

Author: wouterdebruijn

zabbixci/git/git.py

@@ -110,7 +110,6 @@ def switch_branch(self, branch: str):
         Switch to a branch, if the branch does not exist, create it
         """
         if not self._repository.branches.local.get(branch):
-            logger.debug("Branch %s does not exist, creating", branch)
             self.create_branch(branch)
 
         local_branch = self._repository.branches.local[branch]
@@ -124,7 +123,25 @@ def create_branch(self, branch: str):
         Create a branch
         """
         try:
-            peel = self._repository.head.peel(None)
+            peel = None
+            try:
+                # Check for remote branch and base the new branch on it
+                remote_branch = self._repository.branches.remote.get(f"origin/{branch}")
+
+                if remote_branch:
+                    logger.debug(
+                        "Found remote branch %s, basing local branch off it", branch
+                    )
+                    peel = remote_branch.peel(None)
+            except GitError:
+                logger.exception("Fetching remote branch %s failed", branch)
+
+            if not peel:
+                peel = self._repository.head.peel(None)
+                logger.debug(
+                    "Remote branch %s does not exist, basing local branch off HEAD",
+                    branch,
+                )
 
             if not isinstance(peel, Commit):
                 raise GitError("Cannot create branch, HEAD is not a commit")

zabbixci/zabbixci.py

@@ -107,6 +107,11 @@ async def push(self) -> bool:
         if not self._git.is_empty:
             # If the repository is empty, new branches can't be created. But it is
             # safe to push to the default branch
+
+            # Switch to the pull branch, as we base our push branch on it
+            self._git.switch_branch(self.settings.PULL_BRANCH)
+
+            # Switch or create the push branch
             self._git.switch_branch(self.settings.PUSH_BRANCH)
 
             # Pull the latest remote state
@@ -117,12 +122,7 @@ async def push(self) -> bool:
                     "Remote branch does not exist, using state from branch: %s",
                     self.settings.PULL_BRANCH,
                 )
-                # Remote branch does not exist, we pull the default branch and create a new branch
-                self._git.switch_branch(self.settings.PULL_BRANCH)
-                self._git.pull(self.settings.REMOTE)
-
-                # Create a new branch
-                self._git.switch_branch(self.settings.PUSH_BRANCH)
+                self._git.pull(self.settings.REMOTE, branch=self.settings.PULL_BRANCH)
 
         # Reflect current Zabbix state in the cache
         Cleanup.cleanup_cache(self.settings)