summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-11 05:24:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-11 05:24:46 (GMT)
commit020011f2cb9873dccaad71f6ecbe56d0eac530e2 (patch)
treef4c519645767bf8add1f75feb7c75c098f4c6dfa
parent676278f8ea1b9bdd8f235eceb739d7aec4f0ed67 (diff)
parent4ddd4bddb1d2ef94bb66e2d35b43d0e324237907 (diff)
downloadgit-020011f2cb9873dccaad71f6ecbe56d0eac530e2.zip
git-020011f2cb9873dccaad71f6ecbe56d0eac530e2.tar.gz
git-020011f2cb9873dccaad71f6ecbe56d0eac530e2.tar.bz2
Merge branch 'tk/git-svn-trim-author-name'
The author names taken from SVN repositories may have extra leading or trailing whitespaces, which are now munged away. * tk/git-svn-trim-author-name: git-svn: trim leading and trailing whitespaces in author name
-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)';
}