diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2021-08-16 03:13:30 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2021-08-16 03:33:29 +0300 |
| commit | 35023214031e130b43fd14f5ee7cd07e778b8176 (patch) | |
| tree | 3c5d4618a29c51fe9ee0f490ab6fe8959235eaf8 | |
| parent | 7ec057458135eed0dd08e2de4089e4814d71e440 (diff) | |
| download | emacs-35023214031e1.tar.gz | |
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.
| -rw-r--r-- | lisp/vc/vc-git.el | 2 | ||||
| -rw-r--r-- | 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 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 |