Merge pull request #2400 from obfusk/fix-git-pull

don't run git pull when not on a branch
kivy · Jan 5, 2021 · 16f1c26 · 16f1c26
2 parents 3ed4cf0 + c6067df
commit 16f1c26
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -220,11 +220,13 @@ def report_hook(index, blksize, size):
         elif parsed_url.scheme in ('git', 'git+file', 'git+ssh', 'git+http', 'git+https'):
             if isdir(target):
                 with current_directory(target):
-                    shprint(sh.git, 'fetch', '--tags')
+                    shprint(sh.git, 'fetch', '--tags', '--recurse-submodules')
                     if self.version:
                         shprint(sh.git, 'checkout', self.version)
-                    shprint(sh.git, 'pull')
-                    shprint(sh.git, 'pull', '--recurse-submodules')
+                    branch = sh.git('branch', '--show-current')
+                    if branch:
+                        shprint(sh.git, 'pull')
+                        shprint(sh.git, 'pull', '--recurse-submodules')
                     shprint(sh.git, 'submodule', 'update', '--recursive')
             else:
                 if url.startswith('git+'):