diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2021-10-11 16:37:55 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2021-10-11 16:43:55 +0300 |
| commit | 4afff515c870339bdb3fccab4175b063770eb4bf (patch) | |
| tree | 9f6a03c5d6f649fce7bffca767c502b42828778e /lisp/vc/vc-git.el | |
| parent | 36a485a1afb6b352ddb2d036d5ca430f4c6fdd10 (diff) | |
| download | emacs-4afff515c870339bdb3fccab4175b063770eb4bf.tar.gz emacs-4afff515c870339bdb3fccab4175b063770eb4bf.tar.bz2 emacs-4afff515c870339bdb3fccab4175b063770eb4bf.zip | |
Expand the full file name
* lisp/vc/vc-git.el (vc-git--literal-pathspec):
Expand the full file name, not just the local part (bug#51112).
Diffstat (limited to 'lisp/vc/vc-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index eca8d547a90..35c0838dd6f 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -242,15 +242,14 @@ included in the completions." ;;;###autoload (load "vc-git" nil t) ;;;###autoload (vc-git-registered file)))) +;; Good example of file name that needs this: "test[56].xx". (defun vc-git--literal-pathspec (file) "Prepend :(literal) path magic to FILE." - ;; Good example of file name that needs this: "test[56].xx". (when file - (let ((lname (file-local-name file))) - ;; Expand abbreviated file names. - (when (file-name-absolute-p lname) - (setq lname (expand-file-name lname))) - (concat ":(literal)" lname)))) + ;; Expand abbreviated file names. + (when (file-name-absolute-p file) + (setq file (expand-file-name file))) + (concat ":(literal)" (file-local-name file)))) (defun vc-git--literal-pathspecs (files) "Prepend :(literal) path magic to FILES." |