all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
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: Sun, 31 May 2015 17:27:37 +0300	[thread overview]
Message-ID: <83pp5gu8iu.fsf@gnu.org> (raw)
In-Reply-To: <556A1225.9070904@cs.ucla.edu>

> Date: Sat, 30 May 2015 12:40:21 -0700
> From: Paul Eggert <eggert@cs.ucla.edu>
> CC: emacs-devel@gnu.org
> 
>     if some other project using Git doesn't have a pre-commit
>     hook, do I still need to make these changes in .gitattributes for
>     files with DOS EOLs?
> 
> It depends on the maintenance style the other project wants to use, and which versions of Git they want to require (as this stuff has changed since older Git versions). It's a long story. For an intro, please see:
> 
> http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/

Thanks, but that doesn't even mention 'whitespace'.  It talks only
about EOL conversion, which, as I've said, is disabled in my Git
installation (core.autcrlf is unset, which means it's false by
default).  I hope everybody else here does the same, although that
page (and numerous others I've seen) all advise to turn on EOL
conversion, which is simply wrong.

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.



  reply	other threads:[~2015-05-31 14:27 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 [this message]
2015-05-31 19:54             ` Paul Eggert
2015-06-01 15:03               ` Eli Zaretskii

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=83pp5gu8iu.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.