From unknown Fri Aug 15 21:28:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60011: 30.0.50; git commit from *vc-diff* does not work over tramp Resent-From: Sam Steingold Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 12 Dec 2022 16:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60011 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 60011@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Reply-To: sds@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16708627232053 (code B ref -1); Mon, 12 Dec 2022 16:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Dec 2022 16:32:03 +0000 Received: from localhost ([127.0.0.1]:53951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4lik-0000X3-TU for submit@debbugs.gnu.org; Mon, 12 Dec 2022 11:32:03 -0500 Received: from lists.gnu.org ([209.51.188.17]:37052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4lij-0000Wf-7C for submit@debbugs.gnu.org; Mon, 12 Dec 2022 11:32:02 -0500 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 1p4lih-0003wj-D5 for bug-gnu-emacs@gnu.org; Mon, 12 Dec 2022 11:32:01 -0500 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4lid-0004ob-4j; Mon, 12 Dec 2022 11:31:58 -0500 Received: by mail-qt1-x82d.google.com with SMTP id i20so2809860qtw.9; Mon, 12 Dec 2022 08:31:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:date:reply-to:return-receipt-to:subject:to :from:sender:from:to:cc:subject:date:message-id:reply-to; bh=tTCw++GkXPODTWkXRIosVbbkLK14mxKyJSA/GmRiahA=; b=Ck/O7ezlmP+F06H8eTVKVNhcQZ5x7a9ru6b2PGeAQTCbPGMsPMc0WLrYNsCBWGJ4BF mNrO83K5GVs39Ez3cIzi4RMUEILUXJ67vBY3DXFjdFx/DwwXahZQRlZD5AFsRi/T+/xs LZx4kHoFkL/42c/H29Fv4coFE/GtJaKXGNIwUPeVKaHQTxZ6mysDmkVLiFnTmnbW3RXb NUhwp79oJKthW/o5YvrdR0Wo7O/OT25hjMVXOatP0Nom7r9qYarjsWMxi2eZjXhTQ6m6 l9fzQMRKmigMYQ0IEqcJGl7Jrdwjj/bTfsRSLA6Nwv6WkwIT9YDb6j98fHtaPQqrIyTh Jk4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:reply-to:return-receipt-to:subject:to :from:sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tTCw++GkXPODTWkXRIosVbbkLK14mxKyJSA/GmRiahA=; b=4X19QWOo9cAYSHq5s1NHOk32o/OHzztaK6vM0yjnUp/4tYqeqHAUOX998bV4Pzm/1j hqZx9hiUHKcbh1nAactxLheQa75uL+hu1JY01GJWklP/aFw48duJHnf0jAqypZlmAJYl 3rEOLyUEEsz/S/1Lcr5+kSbZeU+n3bfEF1oCI7XakL2d6J6yv2rfwiAQ7gFqyZJssL6a fIqPyVIzMfquluY5KINHkLjUwfkdmJ7EAcbvR0B0iT8BMdOapmgAXisTH7J3hRrtTrll 27u6jRBFAptngB+cMdU/mHONEHpbIAfTXnjppikMV0jQkQqGSSlOmVT8Q754x42crMpw D2gw== X-Gm-Message-State: ANoB5pmam0QXf15h7aHHNOST6sMxOqwOZTFRBS2jk1E5a6dZbgCRcIoL fjubavbqn29VRq70tds2+ageHH61uA== X-Google-Smtp-Source: AA0mqf430YfbZamQgHdwNXn0FKBu3CtmvJfFn1qYuSETwXulew8z27nv6xpXZ8HmrIXUdedyT/gTMw== X-Received: by 2002:ac8:4d07:0:b0:3a7:ef7b:6aac with SMTP id w7-20020ac84d07000000b003a7ef7b6aacmr23052412qtv.11.1670862710734; Mon, 12 Dec 2022 08:31:50 -0800 (PST) Received: from 3c22fb11fdab.ant.amazon.com (pool-72-69-2-113.nycmny.fios.verizon.net. [72.69.2.113]) by smtp.gmail.com with ESMTPSA id a13-20020ac84d8d000000b003972790deb9sm6025233qtw.84.2022.12.12.08.31.49 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Dec 2022 08:31:50 -0800 (PST) From: Sam Steingold X-Attribution: Sam X-Disclaimer: You should not expect anyone to agree with me. Date: Mon, 12 Dec 2022 11:31:48 -0500 Message-ID: MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::82d; envelope-from=sam.steingold@gmail.com; helo=mail-qt1-x82d.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) 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: --8<---------------cut here---------------start------------->8--- 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..." ... vc-git-checkin-patch(#("diff --git a/TEE/lucindex.py b/TEE/lucindex.py\nind..." ... apply(vc-git-checkin-patch (#("diff --git a/TEE/lucindex.py b/TEE/lucindex.py\nind..." ... vc-call-backend(Git checkin-patch #("diff --git a/TEE/lucindex.py b/TEE/lucindex.py\nind..." ... #f(compiled-function (files comment) #) ... vc-finish-logentry() funcall-interactively(vc-finish-logentry) call-interactively(vc-finish-logentry) log-edit-done() funcall-interactively(log-edit-done) call-interactively(log-edit-done nil nil) command-execute(log-edit-done) --8<---------------cut here---------------end--------------->8--- and *vc* says --8<---------------cut here---------------start------------->8--- error: can't open patch '/var/folders/20/__3tt7vx6wg51x8xvqdc1cmw0000gr/T/git-patchAWaImM': No such file or directory --8<---------------cut here---------------end--------------->8--- this is a _local_ directory - it exists on the laptop but not on the "cloud desktop". In GNU Emacs 30.0.50 (build 2, x86_64-apple-darwin21.6.0, NS appkit-2113.60 Version 12.6.1 (Build 21G217)) of 2022-12-12 built on 3c22fb11fdab.ant.amazon.com Repository revision: 5325d815af43a36ea8571851e272c3d39bc19252 Repository branch: master Windowing system distributor 'Apple', version 10.3.2113 System Description: macOS 12.6.1 Configured using: 'configure --with-imagemagick --with-mailutils --with-ns PKG_CONFIG_PATH=' Configured features: ACL GIF GMP GNUTLS IMAGEMAGICK JPEG JSON LCMS2 LIBXML2 MODULES NOTIFY KQUEUE NS PDUMPER PNG SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS WEBP XIM ZLIB Important settings: value of $LC_MESSAGES: C value of $LANG: C locale-coding-system: utf-8-unix Major mode: ELisp/l Minor modes in effect: shell-dirtrack-mode: t bug-reference-prog-mode: t pyvenv-mode: t global-edit-server-edit-mode: t server-mode: t winner-mode: t which-function-mode: t url-handler-mode: t desktop-save-mode: t tooltip-mode: t global-eldoc-mode: t eldoc-mode: t show-paren-mode: t electric-indent-mode: t mouse-wheel-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t column-number-mode: t line-number-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t abbrev-mode: t Load-path shadows: None found. Features: (shadow sort bbdb-message mailalias cookie1 mail-extr gnus-msg emacsbug cl-print debug backtrace log-edit vc-src vc-sccs vc-svn vc-cvs vc-rcs log-view pcvs-util smerge-mode diff misearch multi-isearch skeleton dabbrev url-http url-auth url-gw nsm ein-jupyter ein-dev ein-notebook ein-python-send ein-traceback ein-pytools ein-pager ein-completer ein-notification ein-scratchsheet ein-worksheet poly-ein quail polymode poly-lock polymode-base polymode-weave polymode-export polymode-compat polymode-methods polymode-core polymode-classes eieio-custom eieio-base color ein-kill-ring ein-cell ein-shared-output ein-output-area ein-kernelinfo ein-kernel ein-ipdb ein-events ein-websocket websocket bindat ein-file ein-node ein-notebooklist shortdoc ein-contents-api ein-query ein-log ein-classes ein-core request autorevert anaphora ein-utils deferred dash cc-mode cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs ein display-line-numbers add-log vc-hg vc-bzr tramp-cache time-stamp tramp-sh tramp tramp-loaddefs trampver tramp-integration tramp-compat shell ls-lisp remember score-mode conf-mode bug-reference flyspell ispell display-fill-column-indicator org-element org-persist org-id org-refile avl-tree oc-basic ol-eww eww xdg url-queue mm-url ol-rmail ol-mhe ol-irc ol-info ol-gnus nnselect gnus-art mm-uu mml2015 mm-view mml-smime smime gnutls dig gnus-sum shr pixel-fill kinsoku url-file svg dom browse-url url url-proxy url-privacy url-expand url-methods url-history url-cookie generate-lisp-file url-domsuf url-util gnus-group gnus-undo gnus-start gnus-dbus dbus xml gnus-cloud nnimap nnmail mail-source utf7 nnoo parse-time gnus-spec gnus-int gnus-range message sendmail mailcap yank-media puny rfc822 mml mml-sec epa derived epg rfc6068 epg-config mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums gmm-utils mailheader gnus-win ol-docview doc-view filenotify jka-compr image-mode exif ol-bibtex bibtex iso8601 ol-bbdb ol-w3m ol-doi org-link-doi org ob ob-tangle ob-ref ob-lob ob-table ob-exp org-macro org-src ob-comint org-pcomplete pcomplete org-list org-footnote org-faces org-entities noutline outline ob-emacs-lisp ob-core ob-eval org-cycle org-table ol org-fold org-fold-core org-keys oc org-loaddefs find-func cal-x view cal-china cal-bahai cal-islam holidays holiday-loaddefs bbdb-anniv cal-iso cal-hebrew lunar cal-julian solar cal-dst appt diary-lib diary-loaddefs cal-menu calendar cal-loaddefs org-version org-compat org-macs format-spec vc-dir ewoc vc sh-script smie executable vc-git vc-dispatcher company-oddmuse company-keywords company-etags company-gtags company-dabbrev-code company-dabbrev company-files company-clang company-template company-cmake company-bbdb yasnippet-snippets cl-extra yasnippet flymake-proc flymake thingatpt company-capf company help-fns radix-tree help-mode elpy elpy-rpc pyvenv eshell esh-cmd esh-ext esh-opt esh-proc esh-io esh-arg esh-module esh-groups esh-util cus-start elpy-shell elpy-profile elpy-django s elpy-refactor diff-mode easy-mmode ido hideshow grep compile files-x etags fileloop generator xref python rx project compat compat-macs treesit comint ansi-osc ansi-color dired-aux midnight dired dired-loaddefs cus-edit pp warnings icons gnus nnheader gnus-util text-property-search time-date mail-utils range mm-util mail-prsvr wid-edit bbdb-mua bbdb-com crm mailabbrev bbdb bbdb-site timezone modus-vivendi-theme modus-themes pcase edit-server advice server winner ring which-func imenu url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs password-cache json subr-x map byte-opt gv bytecomp byte-compile url-vars help-at-pt desktop frameset cl-loaddefs cl-lib cus-load info fb2-reader-autoloads async-autoloads f-autoloads ein-autoloads bbdb-autoloads yaml-mode-autoloads with-editor-autoloads dash-autoloads request-autoloads yasnippet-snippets-autoloads compat-autoloads websearch-autoloads elpy-autoloads s-autoloads company-autoloads polymode-autoloads edit-server-autoloads markdown-mode-autoloads rmc iso-transl tooltip cconv eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/ns-win ns-win ucs-normalize mule-util term/common-win tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic indonesian philippine cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads kqueue cocoa ns lcms2 multi-tty make-network-process emacs) Memory information: ((conses 16 691472 82991) (symbols 48 40963 6) (strings 32 262476 9487) (string-bytes 1 7246730) (vectors 16 110814) (vector-slots 8 2207864 131822) (floats 8 1153 347) (intervals 56 17739 877) (buffers 976 105)) -- Sam Steingold (https://aphar.dreamwidth.org/) on darwin Ns 10.3.2113 https://lastingimpactpsychology.com https://steingoldpsychology.com https://iris.org.il https://fairforall.org http://think-israel.org A bullet affects the way the brain functions even when it hits the butt. From unknown Fri Aug 15 21:28:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60011: 30.0.50; git commit from *vc-diff* does not work over tramp 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 X-GNU-PR-Keywords: To: Sam Steingold Cc: 60011@debbugs.gnu.org Received: via spool by 60011-submit@debbugs.gnu.org id=B60011.16708699078452 (code B ref 60011); Mon, 12 Dec 2022 18:32:02 +0000 Received: (at 60011) by debbugs.gnu.org; 12 Dec 2022 18:31:47 +0000 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 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 Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 21D35100006; Mon, 12 Dec 2022 18:31:38 +0000 (UTC) From: Juri Linkov In-Reply-To: (Sam Steingold's message of "Mon, 12 Dec 2022 11:31:48 -0500") Organization: LINKOV.NET References: Date: Mon, 12 Dec 2022 20:29:09 +0200 Message-ID: <86h6y0o4qy.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) > 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. From unknown Fri Aug 15 21:28:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60011: 30.0.50; git commit from *vc-diff* does not work over tramp Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 13 Dec 2022 17:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60011 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Michael Albinus Cc: Sam Steingold , 60011@debbugs.gnu.org Received: via spool by 60011-submit@debbugs.gnu.org id=B60011.167095255725665 (code B ref 60011); Tue, 13 Dec 2022 17:30:03 +0000 Received: (at 60011) by debbugs.gnu.org; 13 Dec 2022 17:29:17 +0000 Received: from localhost ([127.0.0.1]:33490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p595h-0006ft-1F for submit@debbugs.gnu.org; Tue, 13 Dec 2022 12:29:17 -0500 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:33241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p595e-0006fk-Jj for 60011@debbugs.gnu.org; Tue, 13 Dec 2022 12:29:15 -0500 Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 289A8C000A; Tue, 13 Dec 2022 17:29:05 +0000 (UTC) From: Juri Linkov In-Reply-To: <86h6y0o4qy.fsf@mail.linkov.net> (Juri Linkov's message of "Mon, 12 Dec 2022 20:29:09 +0200") Organization: LINKOV.NET References: <86h6y0o4qy.fsf@mail.linkov.net> Date: Tue, 13 Dec 2022 19:16:17 +0200 Message-ID: <86lenbw7w6.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Hi Michael, Could you please confirm that I correctly implemented support for Tramp in the following patch. >> 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...") > > The problem is in these lines that create a temporary file > on a local directory only: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=tramp-vc-git-checkin.patch 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-string)) (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 --=-=-=-- From unknown Fri Aug 15 21:28:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60011: 30.0.50; git commit from *vc-diff* does not work over tramp 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 X-GNU-PR-Keywords: To: Juri Linkov Cc: Sam Steingold , 60011@debbugs.gnu.org Received: via spool by 60011-submit@debbugs.gnu.org id=B60011.167095641514041 (code B ref 60011); Tue, 13 Dec 2022 18:34:01 +0000 Received: (at 60011) by debbugs.gnu.org; 13 Dec 2022 18:33:35 +0000 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 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 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 From: Michael Albinus In-Reply-To: <86lenbw7w6.fsf@mail.linkov.net> (Juri Linkov's message of "Tue, 13 Dec 2022 19:16:17 +0200") References: <86h6y0o4qy.fsf@mail.linkov.net> <86lenbw7w6.fsf@mail.linkov.net> Date: Tue, 13 Dec 2022 19:33:25 +0100 Message-ID: <87tu1zrw5m.fsf@gmx.de> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:BuYAxHiIALAoI4BViGBXCXCiGf3JajTDalW3LBUqILfuVUIqQA7 PhPpozMLCxzfbem0ICnJ+cgWIBFYbjOCdmd2yVj62o546VAbaSzcvX7lEEYa69jGwLC5cn6 hUPszf7TdEkPxPuQD0DFy/G34mnoeTZQjqD+23OkzYiaHtWrJngqBTD06qjXs3SLKKz1Nry c8cQ6Bwc8CzLTKjXHYZRQ== X-Spam-Flag: NO 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/1wLI2FJZlANi6KVX3n891h3I8UOeSyjLnV1ZFxUpjfs4Q61vyXgauHZM6uhCrIvABb9O 07gHvmfPqrISHAGRHqJRkl4KRCefBH7Fj3GWDPQKpOeWHaUONqu8jewIG0lsp6qVXuPT005XG EKr3RFvbxfYv2WaFz+3Jia59dng6yxdqWXeDoDsHHZLRgSmpcU0PJ6Vj1ELSdTAJVnrBVIoSC bN7ufw== Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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. From unknown Fri Aug 15 21:28:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60011: 30.0.50; git commit from *vc-diff* does not work over tramp Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 14 Dec 2022 08:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60011 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Michael Albinus Cc: Sam Steingold , 60011@debbugs.gnu.org Received: via spool by 60011-submit@debbugs.gnu.org id=B60011.167100521615708 (code B ref 60011); Wed, 14 Dec 2022 08:07:01 +0000 Received: (at 60011) by debbugs.gnu.org; 14 Dec 2022 08:06:56 +0000 Received: from localhost ([127.0.0.1]:37499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5Mn1-00045H-L2 for submit@debbugs.gnu.org; Wed, 14 Dec 2022 03:06:55 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:37219) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5Mn0-000453-5I; Wed, 14 Dec 2022 03:06:54 -0500 Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 0554460009; Wed, 14 Dec 2022 08:06:44 +0000 (UTC) From: Juri Linkov In-Reply-To: <87tu1zrw5m.fsf@gmx.de> (Michael Albinus's message of "Tue, 13 Dec 2022 19:33:25 +0100") Organization: LINKOV.NET References: <86h6y0o4qy.fsf@mail.linkov.net> <86lenbw7w6.fsf@mail.linkov.net> <87tu1zrw5m.fsf@gmx.de> Date: Wed, 14 Dec 2022 10:06:18 +0200 Message-ID: <86ilie76kl.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) close 60011 29.0.60 thanks > Please don't use Tramp internal functions. As somebody else said in > this thread, make-nearby-temp-file should be good enough. Thanks for confirming. I was not sure that the fix is so much simple. From unknown Fri Aug 15 21:28:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60011: 30.0.50; git commit from *vc-diff* does not work over tramp Resent-From: Sam Steingold Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 14 Dec 2022 21:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60011 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Juri Linkov Cc: Michael Albinus , 60011@debbugs.gnu.org Received: via spool by 60011-submit@debbugs.gnu.org id=B60011.167105512628114 (code B ref 60011); Wed, 14 Dec 2022 21:59:01 +0000 Received: (at 60011) by debbugs.gnu.org; 14 Dec 2022 21:58:46 +0000 Received: from localhost ([127.0.0.1]:41932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5Zm1-0007JO-PU for submit@debbugs.gnu.org; Wed, 14 Dec 2022 16:58:46 -0500 Received: from mail-pl1-f180.google.com ([209.85.214.180]:42925) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5Zlx-0007JG-Bh for 60011@debbugs.gnu.org; Wed, 14 Dec 2022 16:58:43 -0500 Received: by mail-pl1-f180.google.com with SMTP id d7so4811437pll.9 for <60011@debbugs.gnu.org>; Wed, 14 Dec 2022 13:58:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8+wnV+5prYZZt18EqbbIvUTbQmMeb4l3XvRt3FNHTXg=; b=ooOxxPxoVlBVonJxFRrGG3vVvFzN5m58ntInCtqfNmWghVPYh7Oc3BvKLmVy4gQwoX Gjuv7cuJcj0cxg9wrM7DnfYqPQRLZ4uVKqMjkMKkVTuRVHAeZw9C531uzwTqevNmzKoY mUtTJzaoSnOlHbSfNt08ZANDx1d5JhA5A5SSBGUgFNTPMB83L9Pq3V47cQ8vm2mRnNdk 85UTj8V56kzA2KhPOYnV16bCH4Iuo1d0OZA3IJDRsvwzwfMdbbAG+AsWVfXkC1cemhh4 mfIdI7BmtZbTlSCm51/pWeKndEI4Lc6GlLTIkTExktrYQI/Sx68oozeFTahiEgV/H9M2 exrQ== X-Gm-Message-State: AFqh2kqqOhdc22opKtli9GiOlaPCgxPtkkcJWs7OPqwZfuwlpwq/wweN be96vSFwvEP8MG/hF4nWilBR2Me8AvHELL71lA== X-Google-Smtp-Source: AA0mqf7BJI8KOQL33jaQis60t/x4nh1gdaqIgvPS73tR8KHklrD4e0E/5rW07//7Rauhg95NmHqtyPauFGPg+b2iY6I= X-Received: by 2002:a17:90b:784:b0:219:6c4d:ba9d with SMTP id l4-20020a17090b078400b002196c4dba9dmr402055pjz.175.1671055115373; Wed, 14 Dec 2022 13:58:35 -0800 (PST) MIME-Version: 1.0 References: <86h6y0o4qy.fsf@mail.linkov.net> <86lenbw7w6.fsf@mail.linkov.net> <87tu1zrw5m.fsf@gmx.de> <86ilie76kl.fsf@mail.linkov.net> In-Reply-To: <86ilie76kl.fsf@mail.linkov.net> From: Sam Steingold Date: Wed, 14 Dec 2022 16:58:24 -0500 Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) Juri, thank you very much for fixing the bug. Alas, I don't see your fix in the master - do you mind merging it there also? Thank you again! On Wed, 14 Dec 2022 at 03:06, Juri Linkov wrote: > > close 60011 29.0.60 > thanks > > > Please don't use Tramp internal functions. As somebody else said in > > this thread, make-nearby-temp-file should be good enough. > > Thanks for confirming. I was not sure that the fix is so much simple. -- Sam Steingold From unknown Fri Aug 15 21:28:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60011: 30.0.50; git commit from *vc-diff* does not work over tramp Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 15 Dec 2022 07:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60011 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Sam Steingold Cc: Michael Albinus , 60011@debbugs.gnu.org Received: via spool by 60011-submit@debbugs.gnu.org id=B60011.167108947929571 (code B ref 60011); Thu, 15 Dec 2022 07:32:02 +0000 Received: (at 60011) by debbugs.gnu.org; 15 Dec 2022 07:31:19 +0000 Received: from localhost ([127.0.0.1]:42445 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5ii7-0007gt-IJ for submit@debbugs.gnu.org; Thu, 15 Dec 2022 02:31:19 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:49409) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5ii2-0007gS-Qs for 60011@debbugs.gnu.org; Thu, 15 Dec 2022 02:31:15 -0500 Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id A70F3240008; Thu, 15 Dec 2022 07:31:06 +0000 (UTC) From: Juri Linkov In-Reply-To: (Sam Steingold's message of "Wed, 14 Dec 2022 16:58:24 -0500") Organization: LINKOV.NET References: <86h6y0o4qy.fsf@mail.linkov.net> <86lenbw7w6.fsf@mail.linkov.net> <87tu1zrw5m.fsf@gmx.de> <86ilie76kl.fsf@mail.linkov.net> Date: Thu, 15 Dec 2022 09:27:19 +0200 Message-ID: <861qp1i0tk.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) > Juri, thank you very much for fixing the bug. > Alas, I don't see your fix in the master - do you mind merging it there also? Sorry, we need to wait until someone will merge the changes from the emacs-29 branch to master. I'm not confident doing this myself since the merging script often breaks the NEWS file and omits some commits. From unknown Fri Aug 15 21:28:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60011: 30.0.50; git commit from *vc-diff* does not work over tramp Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 16 Dec 2022 07:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60011 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Sam Steingold Cc: Michael Albinus , 60011@debbugs.gnu.org Received: via spool by 60011-submit@debbugs.gnu.org id=B60011.167117716121252 (code B ref 60011); Fri, 16 Dec 2022 07:53:01 +0000 Received: (at 60011) by debbugs.gnu.org; 16 Dec 2022 07:52:41 +0000 Received: from localhost ([127.0.0.1]:47793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p65WK-0005Wi-Uw for submit@debbugs.gnu.org; Fri, 16 Dec 2022 02:52:41 -0500 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:46727) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p65WJ-0005Wc-6m for 60011@debbugs.gnu.org; Fri, 16 Dec 2022 02:52:40 -0500 Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 70061C0003; Fri, 16 Dec 2022 07:52:31 +0000 (UTC) From: Juri Linkov In-Reply-To: <861qp1i0tk.fsf@mail.linkov.net> (Juri Linkov's message of "Thu, 15 Dec 2022 09:27:19 +0200") Organization: LINKOV.NET References: <86h6y0o4qy.fsf@mail.linkov.net> <86lenbw7w6.fsf@mail.linkov.net> <87tu1zrw5m.fsf@gmx.de> <86ilie76kl.fsf@mail.linkov.net> <861qp1i0tk.fsf@mail.linkov.net> Date: Fri, 16 Dec 2022 09:52:11 +0200 Message-ID: <86sfhfkcpg.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) >> Juri, thank you very much for fixing the bug. >> Alas, I don't see your fix in the master - do you mind merging it there also? > > Sorry, we need to wait until someone will merge the changes from the > emacs-29 branch to master. I'm not confident doing this myself since > the merging script often breaks the NEWS file and omits some commits. Now the fix arrived to master, please try again.