procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 'vc-git--program-version'

Browse source 
* lisp/vc/vc-git.el (vc-git--program-version): Fix the function to
work with Git for Windows.
This commit is contained in:
Eli Zaretskii 2018-02-16 11:30:29 +02:00
parent 63c93f7ecd
commit 6ddb4bd39a
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/vc/vc-git.el
View file

@ -239,8 +239,11 @@ Should be consistent with the Git config value i18n.logOutputEncoding."
(vc-git--run-command-string nil "version"))) (vc-git--run-command-string nil "version")))
(setq vc-git--program-version (setq vc-git--program-version
(if (and version-string (if (and version-string
(string-match "git version \\([0-9.]+\\)$" ;; Git for Windows appends ".windows.N" to the
version-string)) ;; numerical version reported by Git.
(string-match
"git version \\([0-9.]+\\)\\(\.windows.[0-9]+\\)$"
version-string))
(match-string 1 version-string) (match-string 1 version-string)
"0"))))) "0")))))