@matheusbsbs / matheus-bagliano / commits / f7c6de0ea1

git-svn: parse authors file more leniently

Currently, git-svn parses an authors file using the perl regex /^(.+?|$no author$)\s*=\s*(.+?)\s*<(.+)>\s*$/ in order to extract svn user name, real name and e-mail. This does not match an empty e-mail field like "<>". On the other hand, the output of an authors-prog is parsed with the perl regex /^\s*(.+?)\s*<(.*)>\s*$/ in order to extract real name and e-mail. So, specifying a trivial file grep such as grep "$1" /tmp/authors | head -n 1 | cut -d'=' -f2 | cut -c'2-' as the authors prog gives different results compared to specifying /tmp/authors as the authors file directly. Instead, make git svn uses the perl regex /^(.+?|$no author$)\s*=\s*(.+?)\s*<(.*)>\s*$/ for parsing the authors file so that the same (slightly more lenient) regex is used in both cases. Reported-by: Till Schäfer <till2.schaefer@tu-dortmund.de> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Eric Wong <normalperson@yhbt.net>

Michael J Gruber committed Sep 10, 2015 at 14:32 UTC f7c6de0ea1bd5722a1181c6279676c6831b38a34

1 file changed +1 -1

git-svn.perl

+1 -1

@@ -1924,7 +1924,7 @@ sub load_authors {

1924 my $log = $cmd eq 'log';

1925 while (<$authors>) {

1926 chomp;

1927 - next unless /^(.+?|$no author$)\s*=\s*(.+?)\s*<(.+)>\s*$/;

1927 + next unless /^(.+?|$no author$)\s*=\s*(.+?)\s*<(.*)>\s*$/;

1928 my ($user, $name, $email) = ($1, $2, $3);

1929 if ($log) {

1930 $Git::SVN::Log::rusers{"$name <$email>"} = $user;