git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
To: git@vger.kernel.org
Cc: msysGit <msysgit@googlegroups.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Junio C Hamano <gitster@pobox.com>,
	Finn Arne Gangstad <finnag@pvv.org>
Subject: [PATCH v4 0/4] End-of-line normalization, getting close?
Date: Thu, 13 May 2010 23:44:38 +0200	[thread overview]
Message-ID: <cover.1273786317.git.eyvind.bernhardsen@gmail.com> (raw)

Here's the latest series.  Linus's suggested attribute names were a
lot saner than mine, so I've now split the "crlf" attribute into
"crlf" and "eol", and the "crlf" attribute gets renamed to "text" in
the final commit.  I dropped the patch that renamed autocrlf.

git-cvsserver gets a bit more love in this round (particularly the
documentation), so I think it should work as well as it did before.
Not too happy with the logic duplication, though.

Patch 1/4 is still "safe autocrlf" from Finn Arne, just for
convenience.

All in all, I think this looks pretty good now.
-- 
Eyvind


Eyvind Bernhardsen (3):
  Add tests for per-repository eol normalization
  Add per-repository eol normalization
  Rename the "crlf" attribute "text"

Finn Arne Gangstad (1):
  autocrlf: Make it work also for un-normalized repositories

 Documentation/config.txt        |   20 +++--
 Documentation/git-cvsserver.txt |   13 +--
 Documentation/gitattributes.txt |  164 +++++++++++++++++++++++++++++++--------
 attr.c                          |    2 +-
 cache.h                         |    9 ++-
 config.c                        |    2 +-
 convert.c                       |  155 +++++++++++++++++++++++++++++++------
 environment.c                   |    2 +-
 git-cvsserver.perl              |   13 ++-
 t/t0020-crlf.sh                 |   52 ++++++++++++
 t/t0025-crlf-auto.sh            |  156 +++++++++++++++++++++++++++++++++++++
 11 files changed, 507 insertions(+), 81 deletions(-)
 create mode 100755 t/t0025-crlf-auto.sh

             reply	other threads:[~2010-05-13 21:45 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-13 21:44 Eyvind Bernhardsen [this message]
2010-05-13 21:44 ` [PATCH v4 1/4] autocrlf: Make it work also for un-normalized repositories Eyvind Bernhardsen
2010-05-13 21:44 ` [PATCH v4 2/4] Add tests for per-repository eol normalization Eyvind Bernhardsen
2010-05-13 21:44 ` [PATCH v4 3/4] Add " Eyvind Bernhardsen
2010-05-13 21:44 ` [PATCH v4 4/4] Rename the "crlf" attribute "text" Eyvind Bernhardsen

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=cover.1273786317.git.eyvind.bernhardsen@gmail.com \
    --to=eyvind.bernhardsen@gmail.com \
    --cc=finnag@pvv.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=msysgit@googlegroups.com \
    --cc=torvalds@linux-foundation.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).