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: Thu, 24 Aug 2023 07:54:58 +0300 Message-ID: <83pm3dqbtp.fsf@gnu.org> 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> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12553"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 65049@debbugs.gnu.org, habamax@gmail.com, juri@linkov.net To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Aug 24 06:55:17 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 1qZ2NJ-00033P-9i for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 24 Aug 2023 06:55:17 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZ2N2-0001Ne-OL; Thu, 24 Aug 2023 00:55:00 -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 1qZ2N1-0001NG-Fr for bug-gnu-emacs@gnu.org; Thu, 24 Aug 2023 00:54:59 -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 1qZ2N1-0004s6-7I for bug-gnu-emacs@gnu.org; Thu, 24 Aug 2023 00:54:59 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qZ2N3-0005eW-Ps for bug-gnu-emacs@gnu.org; Thu, 24 Aug 2023 00:55:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 24 Aug 2023 04:55: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.169285288921696 (code B ref 65049); Thu, 24 Aug 2023 04:55:01 +0000 Original-Received: (at 65049) by debbugs.gnu.org; 24 Aug 2023 04:54:49 +0000 Original-Received: from localhost ([127.0.0.1]:35859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ2Mq-0005ds-KH for submit@debbugs.gnu.org; Thu, 24 Aug 2023 00:54:49 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59122) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ2Mn-0005dd-80 for 65049@debbugs.gnu.org; Thu, 24 Aug 2023 00:54:46 -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 1qZ2Md-0004fX-Bs; Thu, 24 Aug 2023 00:54:35 -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=eMs8O2CAKkRNbfK0JbvBOCHOwKWwiCJZkmb+jOa45Bs=; b=dXXRvNKbKJSn tynK7QSzb9XpyMWr/GDoR4J+K54BryA1b+ql5166pVvjyk7P7uhisAke2Qjy5fNdm2rmzKFgK0IF9 +v23u9QQkiQLT2SUc1/PG7z+kAqaEfKLAe+GeS4W0Umk03evSuZUMlWylznCNsGiG76XEDSl353I8 Iz8Yw0S3YvYvSd0dZ9arXTbOA4BSFbRjDz2ZTjGMrJMw/KVgcjiOIZ5Rv+LyN1uz/8JikocDpnZTa 8WMBEJ0QdolYaNZqAMuUzyVRn6k0xpi5nF66Q+EwAZE7rtvNpQIVVXfuiOYDYmMZa5Tu8vfuD7XIO 1B7AT2JgNoGd1SjmVDZgtQ==; In-Reply-To: <35b50832-e9ca-9f57-fad6-68621d9b42e7@gutov.dev> (message from Dmitry Gutov on Wed, 23 Aug 2023 23:13:18 +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:268296 Archived-At: > Date: Wed, 23 Aug 2023 23:13:18 +0300 > Cc: juri@linkov.net, 65049@debbugs.gnu.org > From: Dmitry Gutov > > > Dmitry, do you see any problems with installing this on the release > > branch? Or do you prefer to keep it on master for a while, and then > > backport if no one complains? > > It doesn't look "obviously correct" to me, and I'm no pro in the coding > system department. > > If the patch shouldn't affect non-Windows systems (which seems to be > clear for the second hunk, but not for the first one), I'd say we test > (and ask to test) several orthogonal scenarios: when the system is in > the standard language environment, and when it's in the "unixy" one. And > the same regarding the repository. See below. > 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. > 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. 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. > (All the coding system juggling in these files is already too scary for > my taste, but I don't have any better suggestions.) Neither do I.