From 108dbed4c0d874f71bc40f63d39d8777ce192303 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Sun, 12 Sep 2021 03:28:38 +0300 Subject: [PATCH] Re-fix bug#16897 * lisp/vc/vc-git.el (vc-git--file-list-is-rootdir): Extract from 'vc-git-command'. (vc-git--literal-pathspecs): Use it here as well. --- lisp/vc/vc-git.el | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 5835b5b92be..4b309c338a0 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -254,7 +254,8 @@ included in the completions." (defun vc-git--literal-pathspecs (files) "Prepend :(literal) path magic to FILES." - (mapcar #'vc-git--literal-pathspec files)) + (unless (vc-git--file-list-is-rootdir files) + (mapcar #'vc-git--literal-pathspec files))) (defun vc-git-registered (file) "Check whether FILE is registered with git." @@ -1792,15 +1793,18 @@ The difference to vc-do-command is that this function always invokes '("GIT_OPTIONAL_LOCKS=0"))) process-environment))) (apply #'vc-do-command (or buffer "*vc*") okstatus vc-git-program - ;; https://debbugs.gnu.org/16897 - (unless (and (not (cdr-safe file-or-list)) - (let ((file (or (car-safe file-or-list) - file-or-list))) - (and file - (eq ?/ (aref file (1- (length file)))) - (equal file (vc-git-root file))))) - file-or-list) - (cons "--no-pager" flags)))) + ;; https://debbugs.gnu.org/16897 + (unless (vc-git--file-list-is-rootdir file-or-list) + file-or-list) + (cons "--no-pager" flags)))) + +(defun vc-git--file-list-is-rootdir (file-or-list) + (and (not (cdr-safe file-or-list)) + (let ((file (or (car-safe file-or-list) + file-or-list))) + (and file + (eq ?/ (aref file (1- (length file)))) + (equal file (vc-git-root file)))))) (defun vc-git--empty-db-p () "Check if the git db is empty (no commit done yet)." -- 2.39.5