From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#65049: Minor update to the repro steps Date: Sun, 20 Aug 2023 21:25:56 +0300 Message-ID: <83bkf1woy3.fsf@gnu.org> References: <83y1iruky1.fsf@gnu.org> <83il9qom6k.fsf@gnu.org> <86v8dandhq.fsf@mail.linkov.net> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37020"; mail-complaints-to="usenet@ciao.gmane.io" Cc: habamax@gmail.com, 65049@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Aug 20 20:26:29 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 1qXn89-0009Q0-05 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 20 Aug 2023 20:26:29 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXn7q-0008WS-Ph; Sun, 20 Aug 2023 14:26:10 -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 1qXn7j-0008RV-0C for bug-gnu-emacs@gnu.org; Sun, 20 Aug 2023 14:26:03 -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 1qXn7g-0006C5-N7 for bug-gnu-emacs@gnu.org; Sun, 20 Aug 2023 14:26:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXn7i-0003F9-3V for bug-gnu-emacs@gnu.org; Sun, 20 Aug 2023 14:26:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 20 Aug 2023 18: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.169255595112448 (code B ref 65049); Sun, 20 Aug 2023 18:26:02 +0000 Original-Received: (at 65049) by debbugs.gnu.org; 20 Aug 2023 18:25:51 +0000 Original-Received: from localhost ([127.0.0.1]:54850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXn7X-0003Ei-BW for submit@debbugs.gnu.org; Sun, 20 Aug 2023 14:25:51 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:35624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXn7V-0003EU-FV for 65049@debbugs.gnu.org; Sun, 20 Aug 2023 14:25:50 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qXn7O-0006BO-2z; Sun, 20 Aug 2023 14:25:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=hl310mrNV3+MUJjqwwSCWadzPSOxH8ff80C0AdvatSE=; b=TTHhvXE5aIl9 oi9zIK7fuJ/i/pD0UQ4qIsFXuhmcU1EKrO8Iz6bcOrZQ7dVOKJuSezClr7CCrWW7bjuYITWApfdG9 WIW2Ib02fJgRJMutSiONmtwO5noQv4qMxxemnL6eJ3wxIibLarAbv7C/gcrqwoTB4TBVjhtyUYKn1 169f1h5tq52Vae3ZCq7SCVFhOLdmEbT7pTFZGLDLanCpY+En1R/JtNT17vCkhJ4nDHPy9oTNeuwdT TM2ZJQh6/TnylSn4w+WkU9i50vO24koMDX7f+zlrGZYjxt/PeJxmI6Of+qKVoENogj6KS5v1Kx6kv uez2YNvEXkmlCPwkX27yag==; In-Reply-To: <86v8dandhq.fsf@mail.linkov.net> (message from Juri Linkov on Sun, 20 Aug 2023 19:49:53 +0300) 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:268023 Archived-At: > From: Juri Linkov > Cc: Maxim Kim , 65049@debbugs.gnu.org > Date: Sun, 20 Aug 2023 19:49:53 +0300 > > > 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")