git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH v3] git-svn: trim leading and trailing whitespaces in author name
@ 2019-09-13 12:08 Tobias Klauser
  0 siblings, 0 replies; only message in thread
From: Tobias Klauser @ 2019-09-13 12:08 UTC (permalink / raw)
  To: git; +Cc: gitster, Eric Sunshine

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(+)

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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2019-09-13 12:08 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-13 12:08 [PATCH v3] git-svn: trim leading and trailing whitespaces in author name Tobias Klauser

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).