From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.bugs Subject: bug#60011: 30.0.50; git commit from *vc-diff* does not work over tramp Date: Tue, 13 Dec 2022 19:33:25 +0100 Message-ID: <87tu1zrw5m.fsf@gmx.de> References: <86h6y0o4qy.fsf@mail.linkov.net> <86lenbw7w6.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37096"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Sam Steingold , 60011@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Dec 13 19:34:12 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p5A6W-0009T0-3W for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 13 Dec 2022 19:34:12 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5A6O-0004Qd-Mm; Tue, 13 Dec 2022 13:34:04 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5A6N-0004QF-Ab for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 13:34:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p5A6M-0004HB-2T for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 13:34:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5A6L-0003ei-Rc for bug-gnu-emacs@gnu.org; Tue, 13 Dec 2022 13:34:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Michael Albinus Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 13 Dec 2022 18:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60011 X-GNU-PR-Package: emacs Original-Received: via spool by 60011-submit@debbugs.gnu.org id=B60011.167095641514041 (code B ref 60011); Tue, 13 Dec 2022 18:34:01 +0000 Original-Received: (at 60011) by debbugs.gnu.org; 13 Dec 2022 18:33:35 +0000 Original-Received: from localhost ([127.0.0.1]:33902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5A5u-0003eP-H5 for submit@debbugs.gnu.org; Tue, 13 Dec 2022 13:33:34 -0500 Original-Received: from mout.gmx.net ([212.227.17.20]:45879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5A5s-0003eH-IW for 60011@debbugs.gnu.org; Tue, 13 Dec 2022 13:33:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1670956406; bh=LK6t2Q6Hg7qTQqP6O1h7bknrIkAfNLjWntkUZxAjNtM=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date; b=nDlgAC9Dr67TSu4oNrt3hR9HOdgXeCr1gnNI72fkOXeQkGcmgFerJPuB/IEzCu/7T acuFmPgaq/yq1Jpi5X+F/JG2ekIavjGVC3WnWLDPO9kbE9IBSgYtG+V8qDvMBbnBef h+Ivh/Ia1KMSaKtA71LhxvcYkQyp1CabEmTcKOFp7Iwwxx/9T/ZvXoszzAh/GkwSYx jrL6AtLYYUun90/3mf5Y6WcITWeioigjldt22Y0P3etwILZA9w7Ad+MuT7v2iHsyM+ Gsygl2fkqjatHBG7RCtlxh8kzHf+erk1R8PTbfeAH4IMfLJSf7MGhSItubnhCfRzVi nR7i/25N1DMlQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([185.89.39.11]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N17YY-1ouYFo01vO-012V2n; Tue, 13 Dec 2022 19:33:26 +0100 In-Reply-To: <86lenbw7w6.fsf@mail.linkov.net> (Juri Linkov's message of "Tue, 13 Dec 2022 19:16:17 +0200") X-Provags-ID: V03:K1:BuYAxHiIALAoI4BViGBXCXCiGf3JajTDalW3LBUqILfuVUIqQA7 PhPpozMLCxzfbem0ICnJ+cgWIBFYbjOCdmd2yVj62o546VAbaSzcvX7lEEYa69jGwLC5cn6 hUPszf7TdEkPxPuQD0DFy/G34mnoeTZQjqD+23OkzYiaHtWrJngqBTD06qjXs3SLKKz1Nry c8cQ6Bwc8CzLTKjXHYZRQ== UI-OutboundReport: notjunk:1;M01:P0:xBcRPjA2WoI=;3oq7fCUuhsArUEkJfA4MDw0dlKr 5oLae6rdXx3yjgIQyi/n8D6//o4PU/Q8Z7GaT8Je5DgOstTdea6ePCc7Lpeolt9nIzblDW/TE Lrqi8JknvVCBc5JqEk3DVvH8qB11MIPzAXmrZGXxv3K27qP9HgB+wYgX69sbywc0Uc3D5jqJn T4IPBaFI6v1BqoeF4Z9IlwjDBx83xUKQKYWOOVClrM0C1uBPYC30UuniALuSFZ1NHOfwGtI3i Ca1/M8G8qJRFBfY3YYPNR9Ps/f+YnTSaGme8F1isoa3ez+yOkPmoqP5daWnw9taBtiP6ELC/9 vcQx6JZOx2pXaoOoNLNAsdgIWteX/xNlz5g/gssN5Wx/sXDM4f6zLrh8ei8sA8JMrVpKJXCwJ FsRSKxTcSBSb1OblH2y1JXEdXNH48BwG1d7NxZURPScOdflHjOgnSA7evkkJsvRXN12C+kX5O roUwGDjWPjpbe3SPUQoRXB1k2yJSA4v1pEGYKZr7HWpqGdGsvzG8xtFiPdJzeg968PRYVnxYq 4LisjIf1gK+WR50Yx7c0gIhqo8QGj2c1P6sumDfKUZVXfnUDt8GOR1ulyuk0Gss3JiwmmyEoU PeWpM/wHv6iYAPxobcyJdvdHGBupHcuQWwMO/XjRT4uevVJs314oFOij97mW6yEmxNbX5kqWQ bwpWx8g1/P3s0WF05LEUCFC++BvzLd3NPSYTmcy/TO0ZVoc3C6fCjVu2alZSgZTrkCeCP/ZPc V7bU/1wLI2FJZlANi6KVX3n891h3I8UOeSyjLnV1ZFxUpjfs4Q61vyXgauHZM6uhCrIvABb9 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:250878 Archived-At: Juri Linkov writes: > Hi Michael, Hi Juri, > Could you please confirm that I correctly implemented support for > Tramp in the following patch. No. > diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el > index 83138a6d107..65604e84d0e 100644 > --- a/lisp/vc/vc-git.el > +++ b/lisp/vc/vc-git.el > @@ -103,6 +103,7 @@ > (require 'vc-dispatcher) > (eval-when-compile > (require 'subr-x) ; for string-trim-right > + (require 'tramp) > (require 'vc) > (require 'vc-dir)) > > @@ -1048,7 +1049,13 @@ vc-git-checkin > (string-replace file-diff "" vc-git-patch-strin= g)) > (user-error "Index not empty")) > (setq pos (point)))))) > - (let ((patch-file (make-temp-file "git-patch"))) > + (let ((patch-file > + (if (file-remote-p default-directory) > + (with-parsed-tramp-file-name > + (expand-file-name default-directory) nil > + (tramp-make-tramp-file-name > + v (with-no-warnings (tramp-make-tramp-temp-file v))= )) > + (make-temp-file "git-patch")))) > (with-temp-file patch-file > (insert vc-git-patch-string)) > (unwind-protect Please don't use Tramp internal functions. As somebody else said in this thread, make-nearby-temp-file should be good enough. Best regards, Michael.