Skip to content

End-of-line normalization, getting close?

Eyvind Bernhardsen git 2 versions New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest4 patches 0 repliesNew
  2. v35 patches 19 repliesSuperseded

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4autocrlf: Make it work also for un-normalized repositoriesconvert.c t/t0020-crlf.sh+101 -00 replies
2/4Add tests for per-repository eol normalizationt/t0025-crlf-auto.sh+143 -00 replies
3/4Add per-repository eol normalizationDocumentation/config.txt Documentation/gitattributes.txt cache.h +4 more+216 -690 replies
4/4Rename the "crlf" attribute "text"Documentation/config.txt Documentation/git-cvsserver.txt Documentation/gitattributes.txt +4 more+91 -560 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [PATCH v4 0/4] End-of-line normalization, getting close?

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.

Signature · 24 lines
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