aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Kudryavtsev2017-06-04 09:59:49 +0200
committerMichael Albinus2017-06-04 09:59:49 +0200
commit6ad42aecc243d378d38468fd3efd89bc1fbfb187 (patch)
tree9d965df2af277ee92f61855c02c891ba124b2f05
parentd2d6e4452c8f2cf571f2d866b248131b3ef31c3a (diff)
downloademacs-6ad42aecc243d378d38468fd3efd89bc1fbfb187.tar.gz
emacs-6ad42aecc243d378d38468fd3efd89bc1fbfb187.zip
Improve of file-local-name use in vc-git-checkin
* lisp/vc/vc-git.el (vc-git-checkin): Use file-local-name only when calling git commit.
-rw-r--r--lisp/vc/vc-git.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index a4ce76ec37e..cc3e295641c 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -798,14 +798,15 @@ It is based on `log-edit-mode', and has Git-specific extensions.")
798 ;; message. Handle also remote files. 798 ;; message. Handle also remote files.
799 (if (eq system-type 'windows-nt) 799 (if (eq system-type 'windows-nt)
800 (let ((default-directory (file-name-directory file1))) 800 (let ((default-directory (file-name-directory file1)))
801 (file-local-name (make-nearby-temp-file "git-msg")))))) 801 (make-nearby-temp-file "git-msg")))))
802 (cl-flet ((boolean-arg-fn 802 (cl-flet ((boolean-arg-fn
803 (argument) 803 (argument)
804 (lambda (value) (when (equal value "yes") (list argument))))) 804 (lambda (value) (when (equal value "yes") (list argument)))))
805 ;; When operating on the whole tree, better pass "-a" than ".", since "." 805 ;; When operating on the whole tree, better pass "-a" than ".", since "."
806 ;; fails when we're committing a merge. 806 ;; fails when we're committing a merge.
807 (apply 'vc-git-command nil 0 (if only files) 807 (apply 'vc-git-command nil 0 (if only files)
808 (nconc (if msg-file (list "commit" "-F" msg-file) 808 (nconc (if msg-file (list "commit" "-F"
809 (file-local-name msg-file))
809 (list "commit" "-m")) 810 (list "commit" "-m"))
810 (let ((args 811 (let ((args
811 (log-edit-extract-headers 812 (log-edit-extract-headers