emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 6ad42ae: Improve of file-local-name use in vc-git-c


From: Michael Albinus
Subject: [Emacs-diffs] master 6ad42ae: Improve of file-local-name use in vc-git-checkin
Date: Sun, 4 Jun 2017 03:59:59 -0400 (EDT)

branch: master
commit 6ad42aecc243d378d38468fd3efd89bc1fbfb187
Author: Nikolay Kudryavtsev <address@hidden>
Commit: Michael Albinus <address@hidden>

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]