From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#60011: 30.0.50; git commit from *vc-diff* does not work over tramp Date: Mon, 12 Dec 2022 20:29:09 +0200 Organization: LINKOV.NET Message-ID: <86h6y0o4qy.fsf@mail.linkov.net> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40149"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: 60011@debbugs.gnu.org To: Sam Steingold Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 12 19:33:07 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 1p4nbu-000AKB-SW for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 12 Dec 2022 19:33:06 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4nbT-0008Ol-B9; Mon, 12 Dec 2022 13:32:39 -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 1p4nat-0008Lj-Ud for bug-gnu-emacs@gnu.org; Mon, 12 Dec 2022 13:32:28 -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 1p4nas-00085k-Tz for bug-gnu-emacs@gnu.org; Mon, 12 Dec 2022 13:32:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4nas-0002CV-F3 for bug-gnu-emacs@gnu.org; Mon, 12 Dec 2022 13:32:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 12 Dec 2022 18:32:02 +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.16708699078452 (code B ref 60011); Mon, 12 Dec 2022 18:32:02 +0000 Original-Received: (at 60011) by debbugs.gnu.org; 12 Dec 2022 18:31:47 +0000 Original-Received: from localhost ([127.0.0.1]:54590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4nad-0002CG-CG for submit@debbugs.gnu.org; Mon, 12 Dec 2022 13:31:47 -0500 Original-Received: from relay11.mail.gandi.net ([217.70.178.231]:37669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4nab-0002CA-IC for 60011@debbugs.gnu.org; Mon, 12 Dec 2022 13:31:45 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 21D35100006; Mon, 12 Dec 2022 18:31:38 +0000 (UTC) In-Reply-To: (Sam Steingold's message of "Mon, 12 Dec 2022 11:31:48 -0500") 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:250741 Archived-At: > I run Emacs locally (macosx laptop) and edit remote (Amazon Linux "cloud > desktop") files using tramp (scp). > I can commit files using vc/git just fine. > However, when I edit *vc-diff* and hit C-v v v (vc-next-action), and > then edit the commit message abd hit C-c C-c, I get this error: > > Debugger entered--Lisp error: (error "Failed (status 128): git --no-pager apply --cached...") > signal(error ("Failed (status 128): git --no-pager apply --cached...")) > error("Failed (%s): %s" "status 128" "git --no-pager apply --cached /var/folders/20/__3t...") > vc-do-command("*vc*" 0 "git" "/var/folders/20/__3tt7vx6wg51x8xvqdc1cmw0000gr/T/g..." "--no-pager" "apply" "--cached") > apply(vc-do-command "*vc*" 0 "git" "/var/folders/20/__3tt7vx6wg51x8xvqdc1cmw0000gr/T/g..." ("--no-pager" "apply" "--cached")) > vc-git-command(nil 0 "/var/folders/20/__3tt7vx6wg51x8xvqdc1cmw0000gr/T/g..." "apply" "--cached") > vc-git-checkin(nil #("Summary: TEE: split pairs_mx into make_da2mt_mx an..." ... The problem is in these lines that create a temporary file on a local directory only: (let ((patch-file (make-temp-file "git-patch"))) (with-temp-file patch-file (insert vc-git-patch-string)) (unwind-protect (vc-git-command nil 0 patch-file "apply" "--cached") (delete-file patch-file))) I'm not yet sure whether using make-nearby-temp-file could help to create a temporary file on a remote directory, need to try.