batchfetch 1.1.1__tar.gz → 1.1.2__tar.gz

{batchfetch-1.1.1/batchfetch.egg-info → batchfetch-1.1.2}/PKG-INFO

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

{batchfetch-1.1.1 → batchfetch-1.1.2}/batchfetch/batchfetch_base.py

@@ -58,7 +58,7 @@ class TaskBase:
 
         # Options
         self.options = {}
-        self.options.update(deepcopy(self.global_options_values))  # Default
+        self.options.update(deepcopy(self.global_options_values))
         self.options.update(deepcopy(self._item_options))
         schema = Schema(self.global_options_schema)
         schema.validate(self.options)

{batchfetch-1.1.1 → batchfetch-1.1.2}/batchfetch/batchfetch_git.py

@@ -227,21 +227,31 @@ class BatchFetchGit(BatchFetchBase):
                 do_git_pull = True
             else:  # The reference exists
                 try:
-                    # If the tag is annotated, it points to a tag object, not
-                    # directly to a commit. You need to resolve it to the
-                    # commit it points to. Using `git rev-parse
-                    # <tagname>^{commit}` allows getting the right reference.
-                    commit_ref_head = self._git_tags("HEAD^{commit}")[0]
-                except GitReferenceDoesNotExist:
-                    # HEAD is detached
-                    commit_ref_head = None
-
-                # The wanted commit reference does not exist
-                # Or the commit ref of HEAD hasn't changed
-                if commit_ref and commit_ref_head == commit_ref:
-                    do_git_pull = False
-                else:
+                    cmd = ["git", "show-ref", "--verify", "--quiet",
+                           f"refs/heads/{self['reference']}"]
+                    run_simple(cmd, env=self.env, cwd=self.git_local_dir)
                     do_git_pull = True
+                except subprocess.CalledProcessError:
+                    pass
+
+                if not do_git_pull:
+                    try:
+                        # If the tag is annotated, it points to a tag object,
+                        # not directly to a commit. You need to resolve it to
+                        # the commit it points to. Using `git rev-parse
+                        # <tagname>^{commit}` allows getting the right
+                        # reference.
+                        commit_ref_head = self._git_tags("HEAD^{commit}")[0]
+                    except GitReferenceDoesNotExist:
+                        # HEAD is detached
+                        commit_ref_head = None
+
+                    # The wanted commit reference does not exist
+                    # Or the commit ref of HEAD hasn't changed
+                    if commit_ref and commit_ref_head == commit_ref:
+                        do_git_pull = False
+                    else:
+                        do_git_pull = True
 
         if not do_git_pull:
             self.add_output(self.indent_spaces + "[INFO] git pull ignored\n")

{batchfetch-1.1.1 → batchfetch-1.1.2/batchfetch.egg-info}/PKG-INFO

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

{batchfetch-1.1.1 → batchfetch-1.1.2}/setup.py

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