summaryrefslogtreecommitdiff
path: root/perl/Git/SVN.pm
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2019-09-23 09:55:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-09-28 04:51:42 (GMT)
commit4ddd4bddb1d2ef94bb66e2d35b43d0e324237907 (patch)
tree1f5ea250b4ed5f0ed305f5bce8c7c3be570b6250 /perl/Git/SVN.pm
parent5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9 (diff)
downloadgit-4ddd4bddb1d2ef94bb66e2d35b43d0e324237907.zip
git-4ddd4bddb1d2ef94bb66e2d35b43d0e324237907.tar.gz
git-4ddd4bddb1d2ef94bb66e2d35b43d0e324237907.tar.bz2
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 <user1@example.com> Fix this by trimming the author name retreived from svn before using it in check_author. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'perl/Git/SVN.pm')
-rw-r--r--perl/Git/SVN.pm4
1 files changed, 4 insertions, 0 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 76b2965..4b28b87 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)';
}