From: Eli Zaretskii <eliz@gnu.org>
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: emacs-devel@gnu.org
Subject: Re: Git refuses to commit files with DOS EOL
Date: Mon, 01 Jun 2015 18:03:02 +0300 [thread overview]
Message-ID: <836177tqs9.fsf@gnu.org> (raw)
In-Reply-To: <556B6707.3050701@cs.ucla.edu>
> Date: Sun, 31 May 2015 12:54:47 -0700
> From: Paul Eggert <eggert@cs.ucla.edu>
> CC: emacs-devel@gnu.org
>
> that
> page (and numerous others I've seen) all advise to turn on EOL
> conversion, which is simply wrong.
>
> Shrug. It's right for many projects, probably most. But that's not a topic we need to worry about here.
If it is not right for Emacs (and I do hope we agree on that), I don't
see why it would be right for many other projects, let alone most.
But I agree it's not a topic to worry about here.
> After reading all that stuff, including the gitattributes man page, I
> have only one question: why files like dostorture.c are marked
> "-whitespace" and not "whitespace=cr-at-eol"? The latter seems to be
> more specific, and still allows detection of trailing whitespace in
> files with DOS-style EOL
>
> When I wrote that, I was concerned about portability to older versions of git, where the crlf conversion algorithms were different. I didn't want to worry about the hassle of testing this stuff on older Git versions, so I used a conservative (i.e., loose) setting for the CRLF files. If you can verify that a stricter setting based on cr-at-eol is useful on older Git versions on GNUish platforms, feel free to change to the stricter setting.
>
> I suggest testing Git 1.7.1 for this, as per <https://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00037.html>.
I don't have access to a system with Git 1.7.1, and I cannot find this
setting mentioned in the Release Notes (is there a better resource for
looking up a Git release number that introduced some feature?).
However, according to Git's own git repository, this setting was added
in Jan 2008, in a commit about which "git describe" says:
$ git describe b2979ff5
v1.5.4-35-gb2979ff
So I think it is safe for us to use it.
I've pushed a change to that effect.
Thanks.
prev parent reply other threads:[~2015-06-01 15:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-30 11:09 Git refuses to commit files with DOS EOL Eli Zaretskii
2015-05-30 16:35 ` Paul Eggert
2015-05-30 18:33 ` Eli Zaretskii
2015-05-30 18:52 ` Paul Eggert
2015-05-30 19:24 ` Eli Zaretskii
2015-05-30 19:40 ` Paul Eggert
2015-05-31 14:27 ` Eli Zaretskii
2015-05-31 19:54 ` Paul Eggert
2015-06-01 15:03 ` Eli Zaretskii [this message]
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=836177tqs9.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=eggert@cs.ucla.edu \
--cc=emacs-devel@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.