diff options
| author | Dmitry Gutov | 2021-09-23 14:53:31 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2021-09-23 14:53:46 +0300 |
| commit | 46a2c191f2cdda4144dfe7bfce064588f2b2f780 (patch) | |
| tree | d590aa2b0434f968b95f30f11fa31b70ee8f952e /lisp/vc/vc-git.el | |
| parent | a6a1c8600f2a919948412401b8602450f23bb338 (diff) | |
| download | emacs-46a2c191f2cdda4144dfe7bfce064588f2b2f780.tar.gz emacs-46a2c191f2cdda4144dfe7bfce064588f2b2f780.zip | |
Fix vc-annotate-show-log-revision-at-line
* lisp/vc/vc-annotate.el (vc-annotate-show-log-revision-at-line):
Stop from being affected by 'vc-git-print-log-follow'.
* lisp/vc/vc-git.el (vc-git-print-log-follow):
Mention caveats in a comment.
Diffstat (limited to 'lisp/vc/vc-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 8332600c690..eca8d547a90 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el | |||
| @@ -1147,6 +1147,14 @@ This prompts for a branch to merge from." | |||
| 1147 | 1147 | ||
| 1148 | (autoload 'vc-setup-buffer "vc-dispatcher") | 1148 | (autoload 'vc-setup-buffer "vc-dispatcher") |
| 1149 | 1149 | ||
| 1150 | ;; It's a weird option due to how Git handles '--follow', and it can | ||
| 1151 | ;; hide certain (usually merge) commits in the `vc-print-log' buffers. | ||
| 1152 | ;; | ||
| 1153 | ;; (setq vc-git-log-switches '("-m")) can fix that, but at the cost of | ||
| 1154 | ;; duplicating many merge commits in the log. | ||
| 1155 | ;; | ||
| 1156 | ;; Long explanation here: | ||
| 1157 | ;; https://stackoverflow.com/questions/46487476/git-log-follow-graph-skips-commits | ||
| 1150 | (defcustom vc-git-print-log-follow nil | 1158 | (defcustom vc-git-print-log-follow nil |
| 1151 | "If true, follow renames in Git logs for a single file." | 1159 | "If true, follow renames in Git logs for a single file." |
| 1152 | :type 'boolean | 1160 | :type 'boolean |