procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regressions in the last change

Browse source 
* lisp/vc/vc-git.el (vc-git-register):
Use file names verbatim with 'git update-index', as it only accepts
file names, not pathspecs (bug#39452).

* lisp/vc/vc.el (vc-print-root-log):
Expand ROOTDIR, so that vc-git-print-log doesn't receive an
abbreviated name.  Literal pathspecs don't work with those.
This commit is contained in:
Dmitry Gutov 2021-08-16 03:13:30 +03:00
parent 7ec0574581
commit 3502321403
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/vc/vc-git.el
View file

@ -876,7 +876,7 @@ The car of the list is the current branch."
(push crt dlist)
(push crt flist)))
(when flist
(vc-git-command nil 0 (vc-git--literal-pathspecs flist) "update-index" "--add" "--"))
(vc-git-command nil 0 flist "update-index" "--add" "--"))
(when dlist
(vc-git-command nil 0 (vc-git--literal-pathspecs dlist) "add"))))

4
lisp/vc/vc.el
View file

@ -2603,8 +2603,8 @@ with its diffs (if the underlying VCS supports that)."
(setq backend (vc-responsible-backend rootdir))
(unless backend
(error "Directory is not version controlled")))
(setq default-directory rootdir)
(vc-print-log-internal backend (list rootdir) revision revision limit
(setq default-directory (expand-file-name rootdir))
(vc-print-log-internal backend (list default-directory) revision revision limit
(when with-diff 'with-diff))))
;;;###autoload