path: root/git-cvsserver.perl
diff options
authorFabian Emmes <>2009-01-02 15:40:14 (GMT)
committerJunio C Hamano <>2009-01-05 19:30:06 (GMT)
commitd500a1ee8fe4424beb7a98e4fa6159677e7569d0 (patch)
tree72efc8a4f9f4e83caa2b02cbb352ce58ce9362a0 /git-cvsserver.perl
parent280514e1dff3284549175cb0e8edb9b796e8891e (diff)
cvsserver: change generation of CVS author names
CVS username is generated from local part email address. We take the whole local part but restrict the character set to the Portable Filename Character Set, which is used for Unix login names according to Single Unix Specification v3. This will obviously report different usernames from existing repositories for commits with the local part of the author e-mail address that contains characters outside the PFCS. Hopefully this won't break an old CVS checkout from an earlier version of git-cvsserver, because the names are always shown afresh to the CVS clients and not kept on the client side. Signed-off-by: Fabian Emmes <> Signed-off-by: Lars Noschinski <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'git-cvsserver.perl')
1 files changed, 9 insertions, 3 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index cbcaeb4..fef7faf 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -2533,12 +2533,18 @@ sub open_blob_or_die
return $fh;
-# Generate a CVS author name from Git author information, by taking
-# the first eight characters of the user part of the email address.
+# Generate a CVS author name from Git author information, by taking the local
+# part of the email address and replacing characters not in the Portable
+# Filename Character Set (see IEEE Std 1003.1-2001, 3.276) by underscores. CVS
+# Login names are Unix login names, which should be restricted to this
+# character set.
sub cvs_author
my $author_line = shift;
- (my $author) = $author_line =~ /<([^>@]{1,8})/;
+ (my $author) = $author_line =~ /<([^@>]*)/;
+ $author =~ s/[^-a-zA-Z0-9_.]/_/g;
+ $author =~ s/^-/_/;