[PATCH] Fix Git commits over Tramp on Windows

[PATCH] Fix Git commits over Tramp on Windows

[Nikolay Kudryavtsev]

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

Hello.

I noticed that that bug with vc git commits not working on windows still 
isn't patched on master. Any objections to the following patch?

-- 
Best Regards,
Nikolay Kudryavtsev


[-- Attachment #2: 0001-Fix-Git-commits-over-Tramp-on-Windows.patch --]
[-- Type: text/plain, Size: 1514 bytes --]

From 20d6e24e8879add8e14aefd6beba486b38f188d8 Mon Sep 17 00:00:00 2001
From: Nikolay Kudryavtsev <nikolay.kudryavtsev@gmail.com>
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

Re: [PATCH] Fix Git commits over Tramp on Windows

[Michael Albinus]

Nikolay Kudryavtsev <nikolay.kudryavtsev@gmail.com> writes:

> Hello.

Hi Nikolay,

> I noticed that that bug with vc git commits not working on windows
> still isn't patched on master. Any objections to the following patch?

Nothing to comment from Tramp side. It's rather Dmitry to decide.

> Best Regards,
> Nikolay Kudryavtsev

Best regards, Michael.

Re: [PATCH] Fix Git commits over Tramp on Windows

[Dmitry Gutov]

On 5/29/17 8:41 PM, Michael Albinus wrote:

>> I noticed that that bug with vc git commits not working on windows
>> still isn't patched on master. Any objections to the following patch?
> 
> Nothing to comment from Tramp side. It's rather Dmitry to decide.

LGTM, thanks.

Re: [PATCH] Fix Git commits over Tramp on Windows

[Nikolay Kudryavtsev]

Since there are no objections can somebody™ push this to master? Thanks.

-- 
Best Regards,
Nikolay Kudryavtsev

Re: [PATCH] Fix Git commits over Tramp on Windows

[Michael Albinus]

Nikolay Kudryavtsev <nikolay.kudryavtsev@gmail.com> writes:

> Hello.

Hi Nikolay,

> I noticed that that bug with vc git commits not working on windows
> still isn't patched on master. Any objections to the following patch?

Sorry, I thought you have write access to the repo. Committed in your name.

> Best Regards,
> Nikolay Kudryavtsev

Best regards, Michael.