From: Dmitry Gutov <dgutov@yandex.ru>
Date: Mon, 16 Aug 2021 00:13:30 +0000 (+0300)
Subject: Fix regressions in the last change
X-Git-Tag: emacs-28.0.90~1487
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35023214031e1;p=emacs.git

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 ffe1e6832ce..6b26515430f 100644
--- 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 a97caa702a1..e2b12c6cb03 100644
--- 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