Adjust gitPython pull call to handle detached head situation.

smlindauer · smlindauer · commit d68471af0cab · 2022-04-22T15:02:09.000-04:00
diff --git a/src/sasctl/pzmm/gitIntegration.py b/src/sasctl/pzmm/gitIntegration.py
@@ -5,6 +5,7 @@
 from uuid import UUID
 from warnings import warn
 import zipfile
+import git
 from git import Repo
 import io
 
@@ -284,20 +285,21 @@ def gitRepoPush(cls, gPath, commitMessage, branch="origin"):
         pushBranch.push()
 
     @classmethod
-    def gitRepoPull(cls, gPath, branch="origin"):
+    def gitRepoPull(cls, gPath, remote="origin", branch="main"):
         """Pull down any changes from a remote branch of the git repository. The default branch is
         origin.
 
         Parameters
         ----------
         gPath : string or Path
             Base directory of the git repository.
+        remote : string
+            Remote name for the remote repository, by default 'origin'
         branch : string
-            Branch name for the remote repository, by default 'origin'
+            Branch name for the target pull branch from remote, by default 'main'
         """
-        repo = Repo(gPath)
-        pullBranch = repo.remote(name=branch)
-        pullBranch.pull()
+        repo = git.Git(gPath)
+        repo.pull(remote, branch)
 
     @classmethod
     def pushGitProject(cls, gPath, project=None):
