From: Utkarsh Singh <utkarsh190601@gmail.com>
Date: Tue, 1 Jun 2021 09:03:01 +0000 (+0530)
Subject: New user option for Git log switches
X-Git-Tag: emacs-28.0.90~2157
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4a1e97bea96a3ed075cfbc09f4268ba5be9e44fd;p=emacs.git

New user option for Git log switches

* lisp/vc/vc-git.el (vc-git-diff-switches): New defcustom.
(vc-git-print-log): Use it.

* etc/NEWS: Announce the new option.

Copyright-paperwork-exempt: yes
---

diff --git a/etc/NEWS b/etc/NEWS
index 60226f0a3ec..3dca94f97b5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -880,6 +880,10 @@ If non-nil, only branches and remotes are considered when doing
 completion over Git branch names.  The default is nil, which causes
 tags to be considered as well.
 
+---
+*** New user option 'vc-git-log-switches'.
+String or list of strings specifying switches for Git log under VC.
+
 ** Gnus
 
 +++
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index e37c09df7c2..bd29b88e87d 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -127,6 +127,13 @@ If nil, use the value of `vc-annotate-switches'.  If t, use no switches."
 		 (repeat :tag "Argument List" :value ("") string))
   :version "25.1")
 
+(defcustom vc-git-log-switches t
+  "String or list of strings specifying switches for Git log under VC."
+  :type '(choice (const :tag "None" t)
+                 (string :tag "Argument String")
+                 (repeat :tag "Argument List" :value ("") string))
+  :version "28.1")
+
 (defcustom vc-git-resolve-conflicts t
   "When non-nil, mark conflicted file as resolved upon saving.
 That is performed after all conflict markers in it have been
@@ -1131,6 +1138,8 @@ This prompts for a branch to merge from."
   :type 'boolean
   :version "26.1")
 
+(autoload 'vc-switches "vc")
+
 (defun vc-git-print-log (files buffer &optional shortlog start-revision limit)
   "Print commit log associated with FILES into specified BUFFER.
 If SHORTLOG is non-nil, use a short format based on `vc-git-root-log-format'.
@@ -1164,6 +1173,7 @@ If LIMIT is a revision string, use it as an end-revision."
                     ,(format "--pretty=tformat:%s"
 			     (car vc-git-root-log-format))
 		    "--abbrev-commit"))
+                (vc-switches 'git 'log)
 		(when (numberp limit)
                   (list "-n" (format "%s" limit)))
 		(when start-revision
@@ -1385,8 +1395,6 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"."
                                 samp coding-system-for-read t)))
     (setq coding-system-for-read 'undecided)))
 
-(autoload 'vc-switches "vc")
-
 (defun vc-git-diff (files &optional rev1 rev2 buffer _async)
   "Get a difference report using Git between two revisions of FILES."
   (let (process-file-side-effects