From: Nikolay Kudryavtsev <nikolay.kudryavtsev@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 23076@debbugs.gnu.org
Subject: bug#23076: 24.5; vc-git: add a new variable for log output coding system
Date: Mon, 25 Jul 2016 21:46:27 +0300 [thread overview]
Message-ID: <8536522f-fa3f-9fe0-63c0-262b8191b4a3@gmail.com> (raw)
In-Reply-To: <837fch1vmw.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
Here's a patch that fixes vc-git commits over tramp on windows.
I don't have the papers signed, but I think this counts as a trivial
change. If not I'm willing to sign them.
Hope this would be applied into emacs-25 before release.
Thanks.
--
Best Regards,
Nikolay Kudryavtsev
[-- Attachment #2: remote-vc-git-windows.patch --]
[-- Type: text/plain, Size: 2387 bytes --]
diff --git lisp/vc/vc-git.el lisp/vc/vc-git.el
index 9eac5b2..dd2f7af 100644
*** lisp/vc/vc-git.el
--- lisp/vc/vc-git.el
***************
*** 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,731 ----
;; 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)
! (let ((vec (tramp-dissect-file-name file1)))
! (tramp-make-tramp-file-name
! (tramp-file-name-method vec)
! (tramp-file-name-user vec)
! (tramp-file-name-host vec)
! (tramp-make-tramp-temp-file vec)))
! (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"
! (if (file-remote-p msg-file)
! (tramp-file-name-localname
! (tramp-dissect-file-name msg-file))
! msg-file))
(list "commit" "-m"))
(let ((args
(log-edit-extract-headers
next parent reply other threads:[~2016-07-25 18:46 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <acdfa136-1d37-a920-b572-fdd0f6e11257@gmail.com>
[not found] ` <837fch1vmw.fsf@gnu.org>
2016-07-25 18:46 ` Nikolay Kudryavtsev [this message]
2016-07-25 19:10 ` bug#23076: 24.5; vc-git: add a new variable for log output coding system Eli Zaretskii
2016-07-26 19:01 ` Michael Albinus
2016-07-27 2:36 ` Eli Zaretskii
2016-08-07 12:08 ` Michael Albinus
2016-03-21 11:51 Nikolay Kudryavtsev
2016-03-21 19:01 ` Nikolay Kudryavtsev
2016-04-02 10:16 ` Eli Zaretskii
2016-04-03 20:34 ` Nikolay Kudryavtsev
2016-04-04 15:22 ` Eli Zaretskii
2016-04-08 8:23 ` Eli Zaretskii
2016-04-09 12:30 ` Nikolay Kudryavtsev
2016-04-09 12:50 ` Eli Zaretskii
2016-04-09 14:14 ` Nikolay Kudryavtsev
2016-04-09 14:48 ` Eli Zaretskii
2016-04-10 16:10 ` Eli Zaretskii
2016-04-11 22:12 ` Nikolay Kudryavtsev
2016-04-12 15:07 ` Nikolay Kudryavtsev
2016-04-12 15:22 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8536522f-fa3f-9fe0-63c0-262b8191b4a3@gmail.com \
--to=nikolay.kudryavtsev@gmail.com \
--cc=23076@debbugs.gnu.org \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).