From 20d6e24e8879add8e14aefd6beba486b38f188d8 Mon Sep 17 00:00:00 2001 From: Nikolay Kudryavtsev Date: Mon, 29 May 2017 18:59:08 +0300 Subject: [PATCH] Fix Git commits over Tramp on Windows * lisp/vc/vc-git.el (vc-git-checkin): Use file-local-name only when calling git commit. --- lisp/vc/vc-git.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index a4ce76ec37..cc3e295641 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -798,14 +798,15 @@ vc-git-checkin ;; 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 -- 2.13.0.windows.1