merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
2
third_party/git/perl/Git.pm
vendored
2
third_party/git/perl/Git.pm
vendored
|
@ -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.
|
||||
|
||||
|
|
4
third_party/git/perl/Git/SVN.pm
vendored
4
third_party/git/perl/Git/SVN.pm
vendored
|
@ -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)';
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue