From: Maxim Kim <habamax@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 65049@debbugs.gnu.org
Subject: bug#65049: Minor update to the repro steps
Date: Tue, 08 Aug 2023 09:17:40 +1000 [thread overview]
Message-ID: <o33e6d7cq6o31n.fsf@gmail.com> (raw)
In-Reply-To: <83il9qom6k.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 07 Aug 2023 19:24:19 +0300")
Eli Zaretskii <eliz@gnu.org> writes:
> 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.
This file is from the failed attempt of C-x v v
> If you invoke "git diff SOME-FILE > diffs", from the shell prompt,
> where SOME-FILE is a file that is modified wrt the repository's state,
> does the file 'diffs' created by this command have DOS CRLF EOL
> format, or does it have Unix Newline-only EOL format? Try this with a
> file that has Unix EOLs in the repository.
It has:
U -- utf-16le-with-signature-dos (alias: utf-16-le-dos)
UTF-16 (little endian, with signature (BOM)).
Type: utf-16
EOL type: CRLF
This coding system encodes the following charsets:
unicode
> If Git produces DOS CRLF EOLs when it generates diffs, then that is
> your problem, and it can only be fixed in Git itself: you need to
> configure Git to never perform any EOL conversions:
>
> $ git config --global core.autocrlf false
I have just did it and it didn't change the outcome -- still same error,
and I have recreated "git diff SOME-FILE > diffs" and it gives the same
output.
This is strange that after the issued command and "git config --list" I
still can see "core.autocrlf=true" even though in the .gitconfig I have
it set to false now (and it was "input" before the change).
"git config --list --show-origin" shows 2 places:
file:C:/Program Files/Git/etc/gitconfig core.autocrlf=true
...
file:C:/Users/maxim.kim/.gitconfig core.autocrlf=false
and this is weird git isn't picking up user defined setting
(git version 2.41.0.windows.3).
> This is the only sane setting for multiplatform Git repositories,
> especially if you are using Emacs as your editor, because Emacs always
> preserves the EOL format of a file you edit, even if the EOL format is
> not the "native" one on the platform where you edit the file.
>
> (In general, when you install Git on Windows, select the "as-is"
> option of EOL conversions, then you will not need to perform the above
> "git config" command manually, as this will be set up for you from the
> get-go.)
Let me try to reinstall git and select "as-is" option of EOL conversion
> I'm guessing that I don't see the problem you report because I have
> disabled EOL conversion in Git years ago.
That is probably the case, thanks for your time and help.
Max
next prev parent reply other threads:[~2023-08-07 23:17 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 [this message]
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
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=o33e6d7cq6o31n.fsf@gmail.com \
--to=habamax@gmail.com \
--cc=65049@debbugs.gnu.org \
--cc=eliz@gnu.org \
/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.