summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-11 14:24:46 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-11 14:24:46 +0900
commit020011f2cb9873dccaad71f6ecbe56d0eac530e2 (patch)
treef4c519645767bf8add1f75feb7c75c098f4c6dfa
parentMerge branch 'bc/object-id-part17' (diff)
parentgit-svn: trim leading and trailing whitespaces in author name (diff)
downloadtgif-020011f2cb9873dccaad71f6ecbe56d0eac530e2.tar.xz
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 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)';
}