diff options
| -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.") | |||
| 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 |