Fix regressions in the last change

* 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.

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index ffe1e6832cef8a0ae745953bb625126d78f6573e..6b26515430f8270fd6c8c1e77d8e4f9727693d20 100644 (file)
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -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"))))
 

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index a97caa702a1b29c5581d5cd7f9032ed952097512..e2b12c6cb03798e2145ac15cb69a9d9eb37cba62 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -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