diff options
| author | Nikolay Kudryavtsev <nikolay.kudryavtsev@gmail.com> | 2017-06-04 09:59:49 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2017-06-04 09:59:49 +0200 |
| commit | 6ad42aecc243d378d38468fd3efd89bc1fbfb187 (patch) | |
| tree | 9d965df2af277ee92f61855c02c891ba124b2f05 /lisp/vc/vc-git.el | |
| parent | d2d6e4452c8f2cf571f2d866b248131b3ef31c3a (diff) | |
| download | emacs-6ad42aecc243d378d38468fd3efd89bc1fbfb187.tar.gz | |
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.
Diffstat (limited to 'lisp/vc/vc-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 5 |
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.") ;; message. Handle also remote files. (if (eq system-type 'windows-nt) (let ((default-directory (file-name-directory file1))) - (file-local-name (make-nearby-temp-file "git-msg")))))) + (make-nearby-temp-file "git-msg"))))) (cl-flet ((boolean-arg-fn (argument) (lambda (value) (when (equal value "yes") (list argument))))) ;; When operating on the whole tree, better pass "-a" than ".", since "." ;; fails when we're committing a merge. (apply 'vc-git-command nil 0 (if only files) - (nconc (if msg-file (list "commit" "-F" msg-file) + (nconc (if msg-file (list "commit" "-F" + (file-local-name msg-file)) (list "commit" "-m")) (let ((args (log-edit-extract-headers |