threads / patch / 51842

v3git-svn: trim leading and trailing whitespaces in author name

Subject: [PATCH v3] git-svn: trim leading and trailing whitespaces in author name

## tl;dr

One message between Sep 13, 2019 and Sep 13, 2019. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Tobias Klauser· Sep 13, 2019, 12:08 UTC · lore

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(+)
Show changes to perl/Git/SVN.pm +4 −0
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)';
 	}
-- 
2.23.0.1.g588b4aa4a322.dirty

← back to recent threads