batchfetch 1.0.3__tar.gz → 1.0.4__tar.gz

{batchfetch-1.0.3/batchfetch.egg-info → batchfetch-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.0.3
+Version: 1.0.4
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti

{batchfetch-1.0.3 → batchfetch-1.0.4}/batchfetch/batchfetch_base.py

@@ -113,7 +113,7 @@ class BatchFetchBase:
 
         if not stdout.endswith("\n"):
             stdout += "\n"
-        self.add_output((" " * self.indent) + stdout)
+        self.add_output(stdout)
 
     def _run_pre_exec(self, cwd: os.PathLike = Path(".")):
         self._initialize_data()

{batchfetch-1.0.3 → batchfetch-1.0.4}/batchfetch/batchfetch_git.py

@@ -209,16 +209,19 @@ class BatchFetchGit(BatchFetchBase):
             try:
                 self._git_tags(self["branch"])
             except GitBranchDoesNotExist:
-                ignore_git_pull = False
+                pass
             else:
                 # The branch exists
-                ignore_git_pull = True
 
-            # Check if the new branch is different from the current one
-            commit_ref = self._git_ref(cwd=self.git_local_dir)
-            if self.current_branch and (commit_ref == self["branch"] or
-                                        self.current_branch == self["branch"]):
-                ignore_git_pull = True
+                # Ignore Git pull when the git reference is the same
+                commit_ref = self._git_ref(cwd=self.git_local_dir)
+                if (self.current_branch and
+                    (commit_ref == self["branch"] or
+                     self.current_branch == self["branch"])):
+                    ignore_git_pull = True
+                # Ignore Git pull if it is not a local branch
+                elif not self._git_is_local_branch(self["branch"]):
+                    ignore_git_pull = True
 
         if ignore_git_pull:
             self.add_output(self.indent_spaces +
@@ -244,6 +247,23 @@ class BatchFetchGit(BatchFetchBase):
 
         return git_merge
 
+    def _git_is_local_branch(self, branch: str) -> bool:
+        try:
+            stdout, _ = run_simple(["git", "rev-parse", "--symbolic-full-name",
+                                    branch], env=self.env,
+                                   cwd=self.git_local_dir)
+            if not stdout:
+                return False
+
+            full_branch_name = stdout[0].strip()
+
+            if full_branch_name.startswith("refs/heads/"):
+                return True
+        except subprocess.CalledProcessError:
+            pass
+
+        return False
+
     def _git_tags(self, branch: str) -> List[str]:
         stdout: List[str] = []
         try:

{batchfetch-1.0.3 → batchfetch-1.0.4/batchfetch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.0.3
+Version: 1.0.4
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti

{batchfetch-1.0.3 → batchfetch-1.0.4}/setup.py

@@ -22,7 +22,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="batchfetch",
-    version="1.0.3",
+    version="1.0.4",
     packages=find_packages(),
     description="Efficiently clone and pull multiple Git repositories.",
     license="GPLv3",