1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Fix vc-git worktrees and vc-tests for directories with symlinks

* lisp/vc/vc-git.el (vc-git-known-other-working-trees):
* test/lisp/vc/vc-tests/vc-tests.el (vc-test--other-working-trees):
Tolerate directories with symlinks in them, such as the standard
temporary dirs on MacOS.  'git worktree list' outputs expanded names.
This commit is contained in:
Mattias Engdegård 2025-08-04 11:00:53 +02:00 committed by Sean Whitton
parent f9e0c06875
commit 1811cb294e
2 changed files with 11 additions and 7 deletions

View file

@ -684,12 +684,15 @@ This checks also `vc-backend' and `vc-responsible-backend'."
(project-forget-project
(expand-file-name name default-directory))))))
(let* ((first (file-name-as-directory
(expand-file-name "first" default-directory)))
(second (file-name-as-directory
(expand-file-name "second" default-directory)))
(third (file-name-as-directory
(expand-file-name "third" default-directory)))
(let* ((first (file-truename
(file-name-as-directory
(expand-file-name "first" default-directory))))
(second (file-truename
(file-name-as-directory
(expand-file-name "second" default-directory))))
(third (file-truename
(file-name-as-directory
(expand-file-name "third" default-directory))))
(tmp-name (expand-file-name "foo" first))
(project-list-file
(expand-file-name "projects.eld" default-directory)))