summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2018-02-16 19:20:29 +0200
committerEli Zaretskii <eliz@gnu.org>2018-02-16 19:20:29 +0200
commita06a8ed5b66883202ae7182471570dfcabcea973 (patch)
tree610dc289c26eaff356fdf941aaeb700a3b88460f /lisp
parentedc06adf96f4aa9d8b707181015acfe61d396edb (diff)
downloademacs-a06a8ed5b66883202ae7182471570dfcabcea973.tar.gz
emacs-a06a8ed5b66883202ae7182471570dfcabcea973.tar.bz2
emacs-a06a8ed5b66883202ae7182471570dfcabcea973.zip
; * lisp/vc/vc-git.el (vc-git--program-version): Fix last change.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/vc/vc-git.el2
1 files changed, 1 insertions, 1 deletions
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")))))