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>
This commit is contained in:
Eyvind Bernhardsen
2010-05-19 22:43:11 +02:00
committed by Junio C Hamano
parent fd6cce9e89
commit 5ec3e67052
7 changed files with 91 additions and 56 deletions

View File

@ -2369,15 +2369,20 @@ sub kopts_from_path
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");