master 395f9d83f26 1/3: Merge from origin/emacs-29

[Stefan Kangas]

branch: master
commit 395f9d83f2648dd11d64a6c8bd885efbbca8dfba
Merge: 1c901386518 17d40c163e0
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-29
    
    17d40c163e0 vc-git-print-log: Don't assume vc-git-log-switches is a list
---
 lisp/vc/vc-git.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index a1ff03144bc..38e9d5f9c91 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1325,7 +1325,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-git-log-switches
+                (ensure-list vc-git-log-switches)
                 (when (numberp limit)
                   (list "-n" (format "%s" limit)))
                (when start-revision