about summary refs log tree commit diff
path: root/third_party/git/perl
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/perl
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
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, 1 insertions, 5 deletions
diff --git a/third_party/git/perl/Git.pm b/third_party/git/perl/Git.pm
index 54c9ed0ddee5..62c472e0ce41 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 occurred,
+the user. If no *_ASKPASS variable is set or an error occoured,
 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 4b28b8778474..76b29659057d 100644
--- a/third_party/git/perl/Git/SVN.pm
+++ b/third_party/git/perl/Git/SVN.pm
@@ -1491,10 +1491,6 @@ 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)';
 	}