[v3] git-svn: trim leading and trailing whitespaces in author name
diff mbox series

Message ID 20190913120851.23656-1-tklauser@distanz.ch
State New
Headers show
Series
  • [v3] git-svn: trim leading and trailing whitespaces in author name
Related show

Commit Message

Tobias Klauser Sept. 13, 2019, 12:08 p.m. UTC
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.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
v3:
 - check author string length after whitespace trimming
 - trim leading and trailing whitespaces in two separate steps

 perl/Git/SVN.pm | 4 ++++
 1 file changed, 4 insertions(+)

Patch
diff mbox series

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 76b29659057d..4b28b8778474 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)';
 	}