[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 3502321: Fix regressions in the last change
From: |
Dmitry Gutov |
Subject: |
master 3502321: Fix regressions in the last change |
Date: |
Sun, 15 Aug 2021 20:33:40 -0400 (EDT) |
branch: master
commit 35023214031e130b43fd14f5ee7cd07e778b8176
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>
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.
---
lisp/vc/vc-git.el | 2 +-
lisp/vc/vc.el | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index ffe1e68..6b26515 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 a97caa7..e2b12c6 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 3502321: Fix regressions in the last change,
Dmitry Gutov <=