From: Eli Zaretskii <eliz@gnu.org>
To: Dmitry Gutov <dmitry@gutov.dev>
Cc: 65049@debbugs.gnu.org, habamax@gmail.com, juri@linkov.net
Subject: bug#65049: Minor update to the repro steps
Date: Thu, 24 Aug 2023 07:54:58 +0300 [thread overview]
Message-ID: <83pm3dqbtp.fsf@gnu.org> (raw)
In-Reply-To: <35b50832-e9ca-9f57-fad6-68621d9b42e7@gutov.dev> (message from Dmitry Gutov on Wed, 23 Aug 2023 23:13:18 +0300)
> Date: Wed, 23 Aug 2023 23:13:18 +0300
> Cc: juri@linkov.net, 65049@debbugs.gnu.org
> From: Dmitry Gutov <dmitry@gutov.dev>
>
> > 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.
next prev parent reply other threads:[~2023-08-24 4:54 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-04 7:50 bug#65049: 29.1; vc-do-command fails in windows emacs 29.1 Maxim Kim
2023-08-04 8:02 ` bug#65049: Minor update to the repro steps Maxim Kim
2023-08-04 11:05 ` Eli Zaretskii
2023-08-04 11:24 ` Maxim Kim
2023-08-04 17:56 ` Juri Linkov
2023-08-06 23:04 ` Maxim Kim
2023-08-07 1:09 ` Maxim Kim
2023-08-07 16:24 ` Eli Zaretskii
2023-08-07 23:17 ` Maxim Kim
2023-08-20 16:49 ` Juri Linkov
2023-08-20 18:25 ` Eli Zaretskii
2023-08-21 6:53 ` Juri Linkov
2023-08-21 11:00 ` Eli Zaretskii
2023-08-21 11:39 ` Maxim Kim
2023-08-21 12:18 ` Eli Zaretskii
2023-08-21 23:10 ` Maxim Kim
2023-08-22 12:52 ` Eli Zaretskii
2023-08-22 13:12 ` Maxim Kim
2023-08-22 13:17 ` Eli Zaretskii
2023-08-22 23:43 ` Maxim Kim
2023-08-23 4:28 ` Maxim Kim
2023-08-23 16:21 ` Eli Zaretskii
2023-08-23 17:42 ` Juri Linkov
2023-08-23 18:43 ` Eli Zaretskii
2023-08-23 20:13 ` Dmitry Gutov
2023-08-24 4:54 ` Eli Zaretskii [this message]
2023-08-24 21:06 ` Dmitry Gutov
2023-08-24 21:35 ` Dmitry Gutov
2023-08-24 21:44 ` Dmitry Gutov
2023-08-25 6:18 ` Eli Zaretskii
2023-08-26 0:45 ` Dmitry Gutov
2023-08-26 8:50 ` Eli Zaretskii
2023-08-27 1:14 ` Dmitry Gutov
2023-08-27 5:36 ` Eli Zaretskii
2023-08-27 22:32 ` Dmitry Gutov
2023-08-28 12:12 ` Eli Zaretskii
2023-08-28 13:45 ` Dmitry Gutov
2023-08-28 16:12 ` Eli Zaretskii
2023-08-28 16:51 ` Dmitry Gutov
2023-08-28 16:57 ` Eli Zaretskii
2023-08-28 17:39 ` Dmitry Gutov
2023-08-28 18:26 ` Eli Zaretskii
2023-08-31 2:07 ` Richard Stallman
2023-08-31 2:14 ` Dmitry Gutov
2023-08-31 6:00 ` Eli Zaretskii
2023-08-23 23:46 ` Maxim Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83pm3dqbtp.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=65049@debbugs.gnu.org \
--cc=dmitry@gutov.dev \
--cc=habamax@gmail.com \
--cc=juri@linkov.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.