* [PATCH v2] git-svn: trim leading and trailing whitespaces in author name
@ 2019-09-12 14:56 Tobias Klauser
2019-09-12 18:20 ` Eric Sunshine
0 siblings, 1 reply; 3+ messages in thread
From: Tobias Klauser @ 2019-09-12 14:56 UTC (permalink / raw)
To: git; +Cc: gitster, Eric Sunshine
In some cases, the svn author names might contain leading or trailing
whitespaces, leading to messages such as:
Author: user1
not defined in authors.txt
(the trailing newline leads to the line break). The user "user1" is
defined in authors.txt though, e.g.
user1 = User <user1@example.com>
Fix this by trimming the author name retreived from svn before using it
in check_author.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
v2:
- move whitespace trimming below defined'ness check as per Eric Sunshine's
review comment
perl/Git/SVN.pm | 1 +
1 file changed, 1 insertion(+)
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 76b29659057d..d8c07419f51c 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1494,6 +1494,7 @@ sub check_author {
if (!defined $author || length $author == 0) {
$author = '(no author)';
}
+ $author =~ s/^\s+|\s+$//g;
if (!defined $::users{$author}) {
if (defined $::_authors_prog) {
$::users{$author} = call_authors_prog($author);
--
2.23.0.dirty
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] git-svn: trim leading and trailing whitespaces in author name
2019-09-12 14:56 [PATCH v2] git-svn: trim leading and trailing whitespaces in author name Tobias Klauser
@ 2019-09-12 18:20 ` Eric Sunshine
2019-09-13 7:47 ` Tobias Klauser
0 siblings, 1 reply; 3+ messages in thread
From: Eric Sunshine @ 2019-09-12 18:20 UTC (permalink / raw)
To: Tobias Klauser; +Cc: Git List, Junio C Hamano
On Thu, Sep 12, 2019 at 10:56 AM Tobias Klauser <tklauser@distanz.ch> wrote:
> v2:
> - move whitespace trimming below defined'ness check as per Eric Sunshine's
> review comment
> diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
> @@ -1494,6 +1494,7 @@ sub check_author {
> if (!defined $author || length $author == 0) {
> $author = '(no author)';
> }
> + $author =~ s/^\s+|\s+$//g;
Hmm, this still looks questionable. I would have expected the
whitespace trimming to be below the 'defined' check but before the
length($author)==0 check (since the length might become 0 once
whitespace is trimmed).
Also, a minor style/comprehension nit: Perhaps I'm just old-school,
but for me, the idiom:
$author =~ s/^\s+//;
$author =~ s/\s+$//;
is easier to understand at-a-glance as trimming leading and trailing
whitespace than the more compact (noisy) expression this patch uses.
But that's just a subjective review comment, not necessarily
actionable.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] git-svn: trim leading and trailing whitespaces in author name
2019-09-12 18:20 ` Eric Sunshine
@ 2019-09-13 7:47 ` Tobias Klauser
0 siblings, 0 replies; 3+ messages in thread
From: Tobias Klauser @ 2019-09-13 7:47 UTC (permalink / raw)
To: Eric Sunshine; +Cc: Git List, Junio C Hamano
Thank you for the review Eric!
On 2019-09-12 at 20:20:11 +0200, Eric Sunshine <sunshine@sunshineco.com> wrote:
> On Thu, Sep 12, 2019 at 10:56 AM Tobias Klauser <tklauser@distanz.ch> wrote:
> > v2:
> > - move whitespace trimming below defined'ness check as per Eric Sunshine's
> > review comment
> > diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
> > @@ -1494,6 +1494,7 @@ sub check_author {
> > if (!defined $author || length $author == 0) {
> > $author = '(no author)';
> > }
> > + $author =~ s/^\s+|\s+$//g;
>
> Hmm, this still looks questionable. I would have expected the
> whitespace trimming to be below the 'defined' check but before the
> length($author)==0 check (since the length might become 0 once
> whitespace is trimmed).
Agree, I didn't consider this case. Will change in v3.
> Also, a minor style/comprehension nit: Perhaps I'm just old-school,
> but for me, the idiom:
>
> $author =~ s/^\s+//;
> $author =~ s/\s+$//;
>
> is easier to understand at-a-glance as trimming leading and trailing
> whitespace than the more compact (noisy) expression this patch uses.
> But that's just a subjective review comment, not necessarily
> actionable.
Agree, the form you propose is more readable and saving just a line
doesn't seem worth the possible impact on comprehension/readability.
Will change in v3.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-09-13 7:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-12 14:56 [PATCH v2] git-svn: trim leading and trailing whitespaces in author name Tobias Klauser
2019-09-12 18:20 ` Eric Sunshine
2019-09-13 7:47 ` Tobias Klauser
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).