diff options
| author | Juri Linkov <juri@linkov.net> | 2018-02-04 23:58:37 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2018-02-04 23:58:37 +0200 |
| commit | c787a4968273027960a20ced6d63bae0d1ffa87e (patch) | |
| tree | fd9e153058526fd135c147a85f3c3d861cc0027e /lisp | |
| parent | b654791064b43a94150ed6c56053162a6b2ea037 (diff) | |
| download | emacs-c787a4968273027960a20ced6d63bae0d1ffa87e.tar.gz | |
* lisp/vc/vc-git.el (vc-git-print-log): Restrict file scope to a single file
when vc-git-print-log-follow is non-nil (bug#19045).
(vc-git-print-log-follow): Doc fix.
* etc/NEWS: Mention 'vc-git-print-log-follow'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc/vc-git.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 3bf837caaa8..40aa0b26010 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -994,7 +994,7 @@ This prompts for a branch to merge from." (autoload 'vc-setup-buffer "vc-dispatcher") (defcustom vc-git-print-log-follow nil - "If true, follow renames in Git logs for files." + "If true, follow renames in Git logs for a single file." :type 'boolean :version "26.1") @@ -1019,8 +1019,10 @@ If LIMIT is non-nil, show no more than this many entries." (append '("log" "--no-color") (when (and vc-git-print-log-follow - (not (cl-some #'file-directory-p files))) - ;; "--follow" on directories is broken + (null (cdr files)) + (car files) + (not (file-directory-p (car files)))) + ;; "--follow" on directories or multiple files is broken ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=8756 ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=16422 (list "--follow")) |