From: Nikolay Kudryavtsev <nikolay.kudryavtsev@gmail.com>
Date: Sun, 4 Jun 2017 07:59:49 +0000 (+0200)
Subject: Improve of file-local-name use in vc-git-checkin
X-Git-Tag: emacs-26.0.90~521^2~173
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ad42aecc243d378d38468fd3efd89bc1fbfb187;p=emacs.git

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.
---

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