about summary refs log tree commit diff
path: root/third_party/git/perl
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/perl')
-rw-r--r--third_party/git/perl/Git.pm2
-rw-r--r--third_party/git/perl/Git/SVN.pm4
2 files changed, 5 insertions, 1 deletions
diff --git a/third_party/git/perl/Git.pm b/third_party/git/perl/Git.pm
index 62c472e0ce41..54c9ed0ddee5 100644
--- a/third_party/git/perl/Git.pm
+++ b/third_party/git/perl/Git.pm
@@ -563,7 +563,7 @@ sub get_record {
 Query user C<PROMPT> and return answer from user.
 
 Honours GIT_ASKPASS and SSH_ASKPASS environment variables for querying
-the user. If no *_ASKPASS variable is set or an error occoured,
+the user. If no *_ASKPASS variable is set or an error occurred,
 the terminal is tried as a fallback.
 If C<ISPASSWORD> is set and true, the terminal disables echo.
 
diff --git a/third_party/git/perl/Git/SVN.pm b/third_party/git/perl/Git/SVN.pm
index 76b29659057d..4b28b8778474 100644
--- a/third_party/git/perl/Git/SVN.pm
+++ b/third_party/git/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)';
 	}