From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#65049: Minor update to the repro steps Date: Fri, 25 Aug 2023 00:06:20 +0300 Message-ID: References: <83y1iruky1.fsf@gnu.org> <83il9qom6k.fsf@gnu.org> <86v8dandhq.fsf@mail.linkov.net> <83bkf1woy3.fsf@gnu.org> <835y57tf23.fsf@gnu.org> <87edjvp6ev.fsf@gmail.com> <83350btdw8.fsf@gnu.org> <831qftspal.fsf@gnu.org> <35b50832-e9ca-9f57-fad6-68621d9b42e7@gutov.dev> <83pm3dqbtp.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28943"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Cc: 65049@debbugs.gnu.org, habamax@gmail.com, juri@linkov.net To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Aug 24 23:07:18 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 1qZHXx-0007IR-IY for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 24 Aug 2023 23:07:18 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZHXi-0004HA-Ls; Thu, 24 Aug 2023 17:07:03 -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 1qZHXe-0004Gu-0i for bug-gnu-emacs@gnu.org; Thu, 24 Aug 2023 17:06:58 -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 1qZHXd-0002TR-PA for bug-gnu-emacs@gnu.org; Thu, 24 Aug 2023 17:06:57 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qZHXh-0004dk-Sc for bug-gnu-emacs@gnu.org; Thu, 24 Aug 2023 17:07:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 24 Aug 2023 21:07:01 +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.169291119917780 (code B ref 65049); Thu, 24 Aug 2023 21:07:01 +0000 Original-Received: (at 65049) by debbugs.gnu.org; 24 Aug 2023 21:06:39 +0000 Original-Received: from localhost ([127.0.0.1]:38750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZHXK-0004ci-Kt for submit@debbugs.gnu.org; Thu, 24 Aug 2023 17:06:39 -0400 Original-Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:40581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZHXI-0004cI-9F for 65049@debbugs.gnu.org; Thu, 24 Aug 2023 17:06:37 -0400 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id B07FD32009E5; Thu, 24 Aug 2023 17:06:25 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 24 Aug 2023 17:06:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm3; t= 1692911185; x=1692997585; bh=O4iVAbgTcxouJwoEyaMOwZTDuc8HjXoA0Iu LhYLfE3c=; b=lEyxolkbuYjlW5MiOLypP2CmHGPLM87BkmLb4PHAiX+JAYjjuLM fZZFZLSJoWP2h8VvW2GbvGfI4f6nMVvUljrF05fZYJlWH3Y/hLpK0/WJu/a/fASs g8NuzoHQwD4GYbNaq49ucEjL4XRg5f7MzAj7TCUu+ZDWGyfFgRcFtxDGQZjTpQJv PL8wAT3oDJ9Ix5CAbSbKO0+CwfY2ubQ76xIkP+koVMpfD/IImA0aYWhmqLwiW0Bt +hB8APqS5Thtvm6tQ7xnExjCxlr+KHsgEWsZwyUHsCy+Cqc7gceea5e037ZM0nbp Htit5M0m5yLdZncdUmhv3BuyfR54PNjBSCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1692911185; x=1692997585; bh=O4iVAbgTcxouJwoEyaMOwZTDuc8HjXoA0Iu LhYLfE3c=; b=xCsibYZdmjRzk6/PNZHcd7aQtd93UiRmFM7aVMmMVFpr8KNfXHv u8oU+Lg7bL82PkoE3z0iwQ9eM/rkrwNArcFKLbQT39sq9tOM+ovkSjW8OJ1ryzBT L/CkCX0HO7tfDH4fiWsJEwnQAlHp85ZT4h3P9ckEiswqUHWdpw1enbpAoAjPg4vY RzX/9Rv7hOwwDPr4RxwEStoD9Acu9eF77SDo0zoHhUzLgox72PanJl6eglWVZ237 9PCo/5dFW6teHI17lBZvW1CsB6wAmq+qviGhgq1nNxHcM7FJURZJ5n5LBiA9+sEr FbCrIOlaV+H/ngN5tf5LfKjTO7cpSDBNgTA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedruddviedgudehhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefkffggfgfuvfevfhfhjggtgfesthejredttdefjeenucfhrhhomhepffhm ihhtrhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrg htthgvrhhnpefhuedtkeevgeegteetkeefjeffgeduudduhfeuveelfedtffffgeegiedv vdejleenucffohhmrghinhepghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpegumhhithhrhiesghhuthhovhdruggvvh X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 24 Aug 2023 17:06:23 -0400 (EDT) Content-Language: en-US In-Reply-To: <83pm3dqbtp.fsf@gnu.org> 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:268363 Archived-At: On 24/08/2023 07:54, Eli Zaretskii wrote: >> If everything's okay, maybe it's good for emacs-29. It will have a few >> months to stabilize, right? > > For some, hopefully small, value of "few", yes. Hopefully. >> Just as long as the patch goes into master too (that's where the >> bulk of the stabilization will happen, since we have generally >> switched to that branch now for daily use). > > OK. > >>> diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el >>> index 7ae763d..218696c 100644 >>> --- a/lisp/vc/vc-git.el >>> +++ b/lisp/vc/vc-git.el >>> @@ -1051,7 +1051,15 @@ vc-git-checkin >>> (user-error "Index not empty")) >>> (setq pos (point)))))) >>> (unless (string-empty-p vc-git-patch-string) >>> - (let ((patch-file (make-nearby-temp-file "git-patch"))) >>> + (let ((patch-file (make-nearby-temp-file "git-patch")) >>> + ;; Temporarily countermand the let-binding at the >>> + ;; beginning of this function. >>> + (coding-system-for-write >>> + (coding-system-change-eol-conversion >>> + ;; On DOS/Windows, it is important for the patch file >>> + ;; to have the Unix EOL format, because Git expects >>> + ;; that, even on Windows. >>> + (or pcsw vc-git-commits-coding-system) 'unix))) >> >> Any chance this change could negatively affect non-Windows systems? Is >> it a given that the 'unix' line endings are always used there? > > Yes, that should be the case. If you will be more happy with making > this a Windows-only change, I can do that. I'd be more happy with making the "right" change rather than with limiting its scope, given that no release is imminent. Then we can decide which branch to put it on. And given the subject matter, I can't tell whether it's better to limit to Windows users or not. > But before I do, could you > please try the recipe here: > > https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65049#68 > > but with the following change in step 4: > > 4. C-x RET f utf-8-dos RET > > That is, try the recipe on a Posix host with a file whose EOL format > is CRLF. If that works without any changes in the current VC code, I > will be happy to make the first hunk Windows-specific. That works with the current emacs-29. Also tried with the patch applied -- still works.