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#65049: Minor update to the repro steps Date: Mon, 21 Aug 2023 09:53:28 +0300 Organization: LINKOV.NET Message-ID: <86msykc3rz.fsf@mail.linkov.net> References: <83y1iruky1.fsf@gnu.org> <83il9qom6k.fsf@gnu.org> <86v8dandhq.fsf@mail.linkov.net> <83bkf1woy3.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6752"; 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: habamax@gmail.com, 65049@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Aug 21 09:26:20 2023 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 1qXzIq-0001ZK-3g for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 21 Aug 2023 09:26:20 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXzIY-0004AM-MA; Mon, 21 Aug 2023 03:26:02 -0400 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 1qXzIW-00047t-NS for bug-gnu-emacs@gnu.org; Mon, 21 Aug 2023 03:26:00 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qXzIW-00038B-F1 for bug-gnu-emacs@gnu.org; Mon, 21 Aug 2023 03:26:00 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXzIY-0001No-Fh for bug-gnu-emacs@gnu.org; Mon, 21 Aug 2023 03:26:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 21 Aug 2023 07:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65049 X-GNU-PR-Package: emacs Original-Received: via spool by 65049-submit@debbugs.gnu.org id=B65049.16926027235215 (code B ref 65049); Mon, 21 Aug 2023 07:26:02 +0000 Original-Received: (at 65049) by debbugs.gnu.org; 21 Aug 2023 07:25:23 +0000 Original-Received: from localhost ([127.0.0.1]:55356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXzHu-0001M0-U7 for submit@debbugs.gnu.org; Mon, 21 Aug 2023 03:25:23 -0400 Original-Received: from relay7-d.mail.gandi.net ([217.70.183.200]:39625) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXzHs-0001Lg-QW for 65049@debbugs.gnu.org; Mon, 21 Aug 2023 03:25:21 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 18FFA2000A; Mon, 21 Aug 2023 07:25:10 +0000 (UTC) In-Reply-To: <83bkf1woy3.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 20 Aug 2023 21:25:56 +0300") X-GND-Sasl: juri@linkov.net 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:268064 Archived-At: >> > Yes, but where did the file git-patchyYAcN5 come from in the first >> > place? It's that file that is the problem, not how we apply the >> > diffs in that file. >> >> It's created in 'vc-git-checkin': >> >> (let ((patch-file (make-nearby-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") > > Then this should set up EOL conversion correctly for the temporary > file. Something like (untested): > > (let ((patch-file (make-nearby-temp-file "git-patch"))) > (with-temp-file patch-file > (insert vc-git-patch-string) > (set-buffer-file-coding-system 'unix))) > (unwind-protect > (vc-git-command nil 0 patch-file "apply" "--cached") Sorry, I can't test this on Windows.