From: Eli Zaretskii Date: Fri, 16 Feb 2018 17:20:29 +0000 (+0200) Subject: ; * lisp/vc/vc-git.el (vc-git--program-version): Fix last change. X-Git-Tag: emacs-26.1-rc1~205 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a06a8ed;p=emacs.git ; * lisp/vc/vc-git.el (vc-git--program-version): Fix last change. --- diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 7ebb72f2706..2d0ea9ce600 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -242,7 +242,7 @@ Should be consistent with the Git config value i18n.logOutputEncoding." ;; Git for Windows appends ".windows.N" to the ;; numerical version reported by Git. (string-match - "git version \\([0-9.]+\\)\\(\.windows.[0-9]+\\)$" + "git version \\([0-9.]+\\)\\(\.windows.[0-9]+\\)?$" version-string)) (match-string 1 version-string) "0")))))