diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-02-05 07:50:22 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-02-05 07:50:22 -0800 |
| commit | a0c7157a16481b0523ad20cda9115f9435188f73 (patch) | |
| tree | 4e23a700da7c493f54f0afeb337fd963502115cb /lisp/vc/vc-git.el | |
| parent | c24c5dc4a4cc18e7f1ec949efcfe1d4bae541d02 (diff) | |
| parent | c787a4968273027960a20ced6d63bae0d1ffa87e (diff) | |
| download | emacs-a0c7157a16481b0523ad20cda9115f9435188f73.tar.gz emacs-a0c7157a16481b0523ad20cda9115f9435188f73.tar.bz2 emacs-a0c7157a16481b0523ad20cda9115f9435188f73.zip | |
Merge from origin/emacs-26
c787a49 (origin/emacs-26) * lisp/vc/vc-git.el (vc-git-print-log): Res...
b654791 * doc/emacs/misc.texi (Interactive Shell): Refer to node "Min...
f1102d2 Yet another round of fixing the Emacs manual
76b5a68 * etc/NEWS: Expunge the solecism "allow(s)" + infinitive
b4ff8cc Two minor fixes in Antinews
aafcd12 * etc/NEWS: Rename image-dired-thumb-job-limit
a893924 * lisp/simple.el (async-shell-command, shell-command): Fix gr...
699081f Fix deferred display of async shell-command buffers
d2d5e54 Mention remote file name completion in Emacs manual
f589f5a Yest another round of manual copyedits
1ed4089 Update xdisp.c commentary
e23de39 Fix Bug#30324
e1a9dc0 Recognize Org as builtin package (bug#30310)
Conflicts:
etc/NEWS
Diffstat (limited to 'lisp/vc/vc-git.el')
| -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 2d6ca1386a3..47172dd52fa 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -999,7 +999,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") @@ -1024,8 +1024,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")) |