Re: Patches for Emacs 25.2

[Michael Albinus]

Nikolay Kudryavtsev <address@hidden> writes:

> Ok, would my original patch for it count as a safer way? It uses
> internal tramp function, as discussed before, but the change itself is
> local to vc-git.

I don't decide whether such a patch shall be applied; it shall be
decided by the vc maintainer. But in case of, the patch could be written
shorter:

--8<---------------cut here---------------start------------->8---
*** 
/usr/local/src/emacs-25/lisp/vc/vc-git.el.~12da149670a40c6d6c1bc107e8c29d7fcdcf7824~
        2016-10-18 14:29:18.559722705 +0200
--- /usr/local/src/emacs-25/lisp/vc/vc-git.el   2016-10-18 14:29:18.691725102 
+0200
***************
*** 705,718 ****
            ;; arguments must be in the system codepage, and therefore
            ;; might not support the non-ASCII characters in the log
            ;; message.
!           (if (eq system-type 'windows-nt) (make-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)
                        (list "commit" "-m"))
                      (let ((args
                             (log-edit-extract-headers
--- 705,727 ----
            ;; arguments must be in the system codepage, and therefore
            ;; might not support the non-ASCII characters in the log
            ;; message.
!           (if (eq system-type 'windows-nt)
!               (if (file-remote-p file1)
!                 (with-parsed-tramp-file-name file1 nil
!                     (tramp-make-tramp-file-name
!                    method user host
!                    (tramp-make-tramp-temp-file v)))
!                   (make-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"
!                        (or (file-remote-p msg-file 'localname)  msg-file))
                        (list "commit" "-m"))
                      (let ((args
                             (log-edit-extract-headers
--8<---------------cut here---------------end--------------->8---