commit 5ec3e67052289217c84e53d2cda90d939ac5725b
author Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> Wed May 19 22:43:11 2010 +0200
committer Junio C Hamano <gitster@pobox.com> Wed May 19 20:42:34 2010 -0700
tree 925b092d3514202f5bb0af98f9e19dd639f74a99
parent fd6cce9e89ab5ac1125a3b5f5611048ad22379e7

Rename the "crlf" attribute "text"

As discussed on the list, "crlf" is not an optimal name.  Linus
suggested "text", which is much better.

Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-cvsserver.perl

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 13751db..4e55041 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -2369,15 +2369,20 @@
     if ( defined ( $cfg->{gitcvs}{usecrlfattr} ) and
          $cfg->{gitcvs}{usecrlfattr} =~ /\s*(1|true|yes)\s*$/i )
     {
-        my ($val) = check_attr( "crlf", $path );
-        if ( $val eq "set" )
+        my ($val) = check_attr( "text", $path );
+        if ( $val eq "unspecified" )
         {
-            return "";
+            $val = check_attr( "crlf", $path );
         }
-        elsif ( $val eq "unset" )
+        if ( $val eq "unset" )
         {
             return "-kb"
         }
+        elsif ( check_attr( "eol", $path ) ne "unspecified" ||
+                $val eq "set" || $val eq "input" )
+        {
+            return "";
+        }
         else
         {
             $log->info("Unrecognized check_attr crlf $path : $val");