fix(git): Fix update_repo when there are untracked files

jfpedroza · jfpedroza · commit b444275ab0f6 · 2022-09-24T21:55:49.000-05:00
diff --git a/src/libvcs/sync/git.py b/src/libvcs/sync/git.py
@@ -418,9 +418,9 @@ def update_repo(self, set_remotes: bool = False, *args: Any, **kwargs: Any) -> N
             # to be able to perform git pull --rebase
             if need_stash:
                 # If Git < 1.7.6, uses --quiet --all
-                git_stash_save_options = "--quiet"
+                git_stash_save_options = ["--quiet", "--include-untracked"]
                 try:
-                    process = self.run(["stash", "save", git_stash_save_options])
+                    process = self.run(["stash", "save"] + git_stash_save_options)
                 except exc.CommandError:
                     self.log.error("Failed to stash changes")
 
diff --git a/tests/sync/test_git.py b/tests/sync/test_git.py
@@ -112,7 +112,7 @@ def test_repo_git_obtain_full(
 
 @pytest.mark.parametrize(
     # Postpone evaluation of options so fixture variables can interpolate
-    "constructor,lazy_constructor_options",
+    "constructor,lazy_constructor_options,has_untracked_files",
     [
         [
             GitSync,
@@ -121,6 +121,16 @@ def test_repo_git_obtain_full(
                 "dir": tmp_path / "myrepo",
                 "vcs": "git",
             },
+            False,
+        ],
+        [
+            GitSync,
+            lambda git_remote_repo, tmp_path, **kwargs: {
+                "url": f"file://{git_remote_repo}",
+                "dir": tmp_path / "myrepo",
+                "vcs": "git",
+            },
+            True,
         ],
         [
             create_project,
@@ -129,6 +139,16 @@ def test_repo_git_obtain_full(
                 "dir": tmp_path / "myrepo",
                 "vcs": "git",
             },
+            False,
+        ],
+        [
+            create_project,
+            lambda git_remote_repo, tmp_path, **kwargs: {
+                "url": f"git+file://{git_remote_repo}",
+                "dir": tmp_path / "myrepo",
+                "vcs": "git",
+            },
+            True,
         ],
     ],
 )
@@ -138,9 +158,16 @@ def test_repo_update_handle_cases(
     mocker: MockerFixture,
     constructor: ProjectTestFactory,
     lazy_constructor_options: ProjectTestFactoryLazyKwargs,
+    has_untracked_files: bool,
 ) -> None:
     git_repo: GitSync = constructor(**lazy_constructor_options(**locals()))
     git_repo.obtain()  # clone initial repo
+
+    if has_untracked_files:
+        some_file = git_repo.dir.joinpath("some_file")
+        with open(some_file, "w") as untracked_file:
+            untracked_file.write("some content")
+
     mocka = mocker.spy(git_repo, "run")
     git_repo.update_repo()
 
