From: Tobias Klauser <tklauser@distanz.ch>
Date: Mon, 23 Sep 2019 09:55:54 +0000 (+0200)
Subject: git-svn: trim leading and trailing whitespaces in author name
X-Git-Tag: v2.24.0-rc0~39^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ddd4bddb1d2ef94bb66e2d35b43d0e324237907;p=thirdparty%2Fgit.git

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>
---

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)';
 	}