Re: Patches for Emacs 25.2

[Nikolay Kudryavtsev <nikolay.kudryavtsev@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1131 bytes --]

Hello, Michael.

Just to be clear - we're talking about the current master. That one does 
not work. My original patch, or your rewrite in this thread works.

So here's what happens.

1. Msg-file has a local name as its value. Let's say I'm trying to 
commit into repository /pscp:server:/home/user/git-test/. 
Make-nearby-temp-file creates a file 
"/pscp:server:/home/user/git-test/git-msg23408zHn". Msg-file becomes 
"/home/user/git-test/git-msg23408zHn".

2. We concat a git command like "git commit 
/home/user/git-test/git-msg23408zHn". No problem here, since we need a 
local name.

3. (write-region (car args) nil msg-file) happens and it fails, because 
local name "/home/user/git-test/git-msg23408zHn" expands to 
"c:/home/user/git-test/git-msg23408Ncz" which is a file on a local 
machine and it does not exist.

The fix would be having absolute name for 
msg-file(/pscp:server:/home/user/git-test/git-msg23408zHn) and then 
using (or (file-remote-p msg-file 'localname)  msg-file) for git commit. 
Everywhere else we need the absolute name.

I've attached those changes as patch.

-- 
Best Regards,
Nikolay Kudryavtsev


[-- Attachment #2: remote-vc-git-master-fixed.patch --]
[-- Type: text/plain, Size: 1159 bytes --]

diff --git lisp/vc/vc-git.el lisp/vc/vc-git.el
index c670280..616c150 100644
--- lisp/vc/vc-git.el
+++ lisp/vc/vc-git.el
@@ -707,14 +707,16 @@
           ;; 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"
+                                       (or (file-remote-p msg-file 'localname)
+                                           msg-file))
                       (list "commit" "-m"))
                     (let ((args
                            (log-edit-extract-headers