summaryrefslogtreecommitdiff
path: root/git-cvsserver.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-21 06:02:49 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-21 06:02:49 -0700
commitd5cff17edaf438bbf45a2130e9cadc0c938291d6 (patch)
tree19acab3f0fbb8fa480cb45a315d0dac2e6f16ab1 /git-cvsserver.perl
parentd249515f297d47df6d79167b988eaa7db0981178 (diff)
parent942e7747678ecf5f118ea5b2d0c763166de21f3a (diff)
downloadgit-d5cff17edaf438bbf45a2130e9cadc0c938291d6.tar.gz
Merge branch 'eb/core-eol'
* eb/core-eol: Add "core.eol" config variable Rename the "crlf" attribute "text" Add per-repository eol normalization Add tests for per-repository eol normalization Conflicts: Documentation/config.txt Makefile
Diffstat (limited to 'git-cvsserver.perl')
-rwxr-xr-xgit-cvsserver.perl13
1 files changed, 9 insertions, 4 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 0f45c39509..e9f3037df3 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -2415,15 +2415,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");