[Diff][Fixed] Problems when trying to use an already existent worktree

Fixes #555

CHANGELOG.md

@@ -142,6 +142,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Diff
   - `current`: didn't apply global variants
   - `current`: didn't honor KiCad native DNP flags, they need a filter
+  - Problems when trying to use an already existent worktree (#555)
 - PCB Print:
   - Issues when forcing the board edge and using scaling (#532)
   - Text not searchable when using newer rsvg-convert tools (#552)

kibot/out_diff.py

@@ -373,7 +373,7 @@ class DiffOptions(AnyDiffOptions):
             name = self.solve_git_name(name)
             git_tmp_wd = mkdtemp()
             logger.debug('Checking out '+name+' to '+git_tmp_wd)
-            self.run_git(['worktree', 'add', git_tmp_wd, name])
+            self.run_git(['worktree', 'add', '--force', git_tmp_wd, name])
             self._worktrees_to_remove.append(git_tmp_wd)
             self.run_git(['submodule', 'update', '--init', '--recursive'], cwd=git_tmp_wd)
             name_copy = self.run_git(['ls-files', '--full-name', self.file])

kibot/out_kiri.py

@@ -285,7 +285,7 @@ class KiRiOptions(AnyDiffOptions):
                         rmtree(dst_dir)
                     git_tmp_wd = mkdtemp()
                     logger.debug('Checking out '+hash+' to '+git_tmp_wd)
-                    self.run_git(['worktree', 'add', git_tmp_wd, hash])
+                    self.run_git(['worktree', 'add', '--force', git_tmp_wd, hash])
                     self.run_git(['submodule', 'update', '--init', '--recursive'], cwd=git_tmp_wd)
                     # Generate SVGs for the schematic
                     name_sch = self.do_cache(self.sch_rel_name, git_tmp_wd, hash)