From 4ddd4bddb1d2ef94bb66e2d35b43d0e324237907 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 23 Sep 2019 11:55:54 +0200 Subject: git-svn: trim leading and trailing whitespaces in author name In some cases, the svn author names might contain leading or trailing whitespaces, leading to messages such as: Author: user1 not defined in authors.txt (the trailing newline leads to the line break). The user "user1" is defined in authors.txt though, e.g. user1 = User Fix this by trimming the author name retreived from svn before using it in check_author. Helped-by: Eric Sunshine Signed-off-by: Tobias Klauser Signed-off-by: Junio C Hamano --- perl/Git/SVN.pm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'perl/Git/SVN.pm') diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index 76b2965905..4b28b87784 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -1491,6 +1491,10 @@ sub call_authors_prog { sub check_author { my ($author) = @_; + if (defined $author) { + $author =~ s/^\s+//g; + $author =~ s/\s+$//g; + } if (!defined $author || length $author == 0) { $author = '(no author)'; } -- cgit v1.2.3