git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
* [PATCH v2 0/2] git-svn: --author-prog improvements
       [not found] <20180304112237.19254-1-asheiduk@gmail.co>
@ 2018-03-11 13:58 ` Andreas Heiduk
  2018-03-18 21:19   ` Andreas Heiduk
  2018-03-11 13:58 ` [PATCH v2 1/2] git-svn: search --authors-prog in PATH too Andreas Heiduk
  2018-03-11 13:58 ` [PATCH v2 2/2] git-svn: allow empty email-address in authors-prog and authors-file Andreas Heiduk
  2 siblings, 1 reply; 13+ messages in thread
From: Andreas Heiduk @ 2018-03-11 13:58 UTC (permalink / raw)
  To: Git Mailing List, Eric Wong; +Cc: Andreas Heiduk

The first patch has been queued by Eric Wong but by Junio Hamano, so
I'm not sure what's the expected procedure. I#M posting it again just
in case.

The second patch has grown up with some documentation and some tests.

Andreas Heiduk (2):
  git-svn: search --authors-prog in PATH too
  git-svn: allow empty email-address in authors-prog and authors-file

 Documentation/git-svn.txt       | 13 ++++++++++---
 git-svn.perl                    |  3 ++-
 perl/Git/SVN.pm                 | 13 ++++++-------
 t/t9130-git-svn-authors-file.sh | 14 ++++++++++++++
 t/t9138-git-svn-authors-prog.sh | 25 ++++++++++++++++++++++++-
 5 files changed, 56 insertions(+), 12 deletions(-)

-- 
2.16.2


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 1/2] git-svn: search --authors-prog in PATH too
       [not found] <20180304112237.19254-1-asheiduk@gmail.co>
  2018-03-11 13:58 ` [PATCH v2 0/2] git-svn: --author-prog improvements Andreas Heiduk
@ 2018-03-11 13:58 ` Andreas Heiduk
  2018-03-11 13:58 ` [PATCH v2 2/2] git-svn: allow empty email-address in authors-prog and authors-file Andreas Heiduk
  2 siblings, 0 replies; 13+ messages in thread
From: Andreas Heiduk @ 2018-03-11 13:58 UTC (permalink / raw)
  To: Git Mailing List, Eric Wong; +Cc: Andreas Heiduk

In 36db1eddf9 ("git-svn: add --authors-prog option", 2009-05-14) the path
to authors-prog was made absolute because git-svn changes the current
directory in some situations. This makes sense if the program is part of
the repository but prevents searching via $PATH.

The old behaviour is still retained, but if the file does not exists, then
authors-prog is searched for in $PATH as any other command.

Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
Signed-off-by: Eric Wong <e@80x24.org>
---
 Documentation/git-svn.txt | 5 +++++
 git-svn.perl              | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 636e09048e..b858374649 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -657,6 +657,11 @@ config key: svn.authorsfile
 	expected to return a single line of the form "Name <email>",
 	which will be treated as if included in the authors file.
 +
+Due to historical reasons a relative 'filename' is first searched
+relative to the current directory for 'init' and 'clone' and relative
+to the root of the working tree for 'fetch'. If 'filename' is
+not found, it is searched like any other command in '$PATH'.
++
 [verse]
 config key: svn.authorsProg
 
diff --git a/git-svn.perl b/git-svn.perl
index a6b6c3e40c..050f2a36f4 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -374,7 +374,8 @@ version() if $_version;
 usage(1) unless defined $cmd;
 load_authors() if $_authors;
 if (defined $_authors_prog) {
-	$_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'";
+	my $abs_file = File::Spec->rel2abs($_authors_prog);
+	$_authors_prog = "'" . $abs_file . "'" if -x $abs_file;
 }
 
 unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) {
-- 
2.16.2


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2 2/2] git-svn: allow empty email-address in authors-prog and authors-file
       [not found] <20180304112237.19254-1-asheiduk@gmail.co>
  2018-03-11 13:58 ` [PATCH v2 0/2] git-svn: --author-prog improvements Andreas Heiduk
  2018-03-11 13:58 ` [PATCH v2 1/2] git-svn: search --authors-prog in PATH too Andreas Heiduk
@ 2018-03-11 13:58 ` Andreas Heiduk
  2018-03-18 23:04   ` Eric Wong
  2 siblings, 1 reply; 13+ messages in thread
From: Andreas Heiduk @ 2018-03-11 13:58 UTC (permalink / raw)
  To: Git Mailing List, Eric Wong; +Cc: Andreas Heiduk

The email address in --authors-file and --authors-prog can be empty but
git-svn translated it into a syntethic email address in the form
$USERNAME@$REPO_UUID. Now git-svn behaves like git-commit: If the email
is explicitly set to the empty string, the commit does not contain
an email address.

Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
---
 Documentation/git-svn.txt       |  8 +++++---
 perl/Git/SVN.pm                 | 13 ++++++-------
 t/t9130-git-svn-authors-file.sh | 14 ++++++++++++++
 t/t9138-git-svn-authors-prog.sh | 25 ++++++++++++++++++++++++-
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index b858374649..d59379ee23 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -635,7 +635,8 @@ config key: svn.findcopiesharder
 
 -A<filename>::
 --authors-file=<filename>::
-	Syntax is compatible with the file used by 'git cvsimport':
+	Syntax is compatible with the file used by 'git cvsimport' but
+	an empty email address can be supplied with '<>':
 +
 ------------------------------------------------------------------------
 	loginname = Joe User <user@example.com>
@@ -654,8 +655,9 @@ config key: svn.authorsfile
 	If this option is specified, for each SVN committer name that
 	does not exist in the authors file, the given file is executed
 	with the committer name as the first argument.  The program is
-	expected to return a single line of the form "Name <email>",
-	which will be treated as if included in the authors file.
+	expected to return a single line of the form "Name <email>" or
+	"Name <>", which will be treated as if included in the authors
+	file.
 +
 Due to historical reasons a relative 'filename' is first searched
 relative to the current directory for 'init' and 'clone' and relative
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index bc4eed3d75..945ca4db2b 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1482,7 +1482,6 @@ sub call_authors_prog {
 	}
 	if ($author =~ /^\s*(.+?)\s*<(.*)>\s*$/) {
 		my ($name, $email) = ($1, $2);
-		$email = undef if length $2 == 0;
 		return [$name, $email];
 	} else {
 		die "Author: $orig_author: $::_authors_prog returned "
@@ -2020,8 +2019,8 @@ sub make_log_entry {
 		remove_username($full_url);
 		$log_entry{metadata} = "$full_url\@$r $uuid";
 		$log_entry{svm_revision} = $r;
-		$email ||= "$author\@$uuid";
-		$commit_email ||= "$author\@$uuid";
+		$email = "$author\@$uuid" unless defined $email;
+		$commit_email = "$author\@$uuid" unless defined $commit_email;
 	} elsif ($self->use_svnsync_props) {
 		my $full_url = canonicalize_url(
 			add_path_to_url( $self->svnsync->{url}, $self->path )
@@ -2029,15 +2028,15 @@ sub make_log_entry {
 		remove_username($full_url);
 		my $uuid = $self->svnsync->{uuid};
 		$log_entry{metadata} = "$full_url\@$rev $uuid";
-		$email ||= "$author\@$uuid";
-		$commit_email ||= "$author\@$uuid";
+		$email = "$author\@$uuid" unless defined $email;
+		$commit_email = "$author\@$uuid" unless defined $commit_email;
 	} else {
 		my $url = $self->metadata_url;
 		remove_username($url);
 		my $uuid = $self->rewrite_uuid || $self->ra->get_uuid;
 		$log_entry{metadata} = "$url\@$rev " . $uuid;
-		$email ||= "$author\@" . $uuid;
-		$commit_email ||= "$author\@" . $uuid;
+		$email = "$author\@$uuid" unless defined $email;
+		$commit_email = "$author\@$uuid" unless defined $commit_email;
 	}
 	$log_entry{name} = $name;
 	$log_entry{email} = $email;
diff --git a/t/t9130-git-svn-authors-file.sh b/t/t9130-git-svn-authors-file.sh
index 41264818cc..6af6daf461 100755
--- a/t/t9130-git-svn-authors-file.sh
+++ b/t/t9130-git-svn-authors-file.sh
@@ -108,6 +108,20 @@ test_expect_success !MINGW 'fresh clone with svn.authors-file in config' '
 	)
 '
 
+cat >> svn-authors <<EOF
+ff = FFFFFFF FFFFFFF <>
+EOF
+
+test_expect_success 'authors-file imported user without email' '
+	svn_cmd mkdir -m aa/branches/ff --username ff "$svnrepo/aa/branches/ff" &&
+	(
+		cd aa-work &&
+		git svn fetch --authors-file=../svn-authors &&
+		git rev-list -1 --pretty=raw refs/remotes/origin/ff | \
+		  grep "^author FFFFFFF FFFFFFF <> "
+	)
+	'
+
 test_debug 'GIT_DIR=gitconfig.clone/.git git log'
 
 test_done
diff --git a/t/t9138-git-svn-authors-prog.sh b/t/t9138-git-svn-authors-prog.sh
index 7d7e9d46bc..0cec56128f 100755
--- a/t/t9138-git-svn-authors-prog.sh
+++ b/t/t9138-git-svn-authors-prog.sh
@@ -9,7 +9,9 @@ test_description='git svn authors prog tests'
 
 write_script svn-authors-prog "$PERL_PATH" <<-\EOF
 	$_ = shift;
-	if (s/-sub$//)  {
+	if (s/-hermit//) {
+		print "$_ <>\n";
+	} elsif (s/-sub$//)  {
 		print "$_ <$_\@sub.example.com>\n";
 	} else {
 		print "$_ <$_\@example.com>\n";
@@ -68,6 +70,27 @@ test_expect_success 'authors-file overrode authors-prog' '
 git --git-dir=x/.git config --unset svn.authorsfile
 git --git-dir=x/.git config --unset svn.authorsprog
 
+test_expect_success 'authors-prog imported user without email' '
+	svn mkdir -m gg --username gg-hermit "$svnrepo"/gg &&
+	(
+		cd x &&
+		git svn fetch --authors-prog=../svn-authors-prog &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn | \
+		  grep "^author gg <> "
+	)
+'
+
+test_expect_success 'imported without authors-prog and authors-file' '
+	svn mkdir -m hh --username hh "$svnrepo"/hh &&
+	(
+		uuid=$(svn info --show-item=repos-uuid "$svnrepo") &&
+		cd x &&
+		git svn fetch &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn | \
+		  grep "^author hh <hh@$uuid> "
+	)
+'
+
 test_expect_success 'authors-prog handled special characters in username' '
 	svn mkdir -m bad --username "xyz; touch evil" "$svnrepo"/bad &&
 	(
-- 
2.16.2


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v2 0/2] git-svn: --author-prog improvements
  2018-03-11 13:58 ` [PATCH v2 0/2] git-svn: --author-prog improvements Andreas Heiduk
@ 2018-03-18 21:19   ` Andreas Heiduk
  2018-03-18 21:31     ` Eric Sunshine
  0 siblings, 1 reply; 13+ messages in thread
From: Andreas Heiduk @ 2018-03-18 21:19 UTC (permalink / raw)
  To: Git Mailing List, Eric Wong

No comments on this one?

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v2 0/2] git-svn: --author-prog improvements
  2018-03-18 21:19   ` Andreas Heiduk
@ 2018-03-18 21:31     ` Eric Sunshine
  0 siblings, 0 replies; 13+ messages in thread
From: Eric Sunshine @ 2018-03-18 21:31 UTC (permalink / raw)
  To: Andreas Heiduk; +Cc: Git Mailing List, Eric Wong

On Sun, Mar 18, 2018 at 5:19 PM, Andreas Heiduk <asheiduk@gmail.com> wrote:
> No comments on this one?

I can't speak for Eric W., but my impression was that v2 did not
address his concern that patch 2/2's unconditional change of behavior
was unacceptable[1]. He didn't say so explicitly, but perhaps the
implication was that he might be more open to the behavior change
being an opt-in.

[1]: https://public-inbox.org/git/20180305202017.GA26533@whir/

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v2 2/2] git-svn: allow empty email-address in authors-prog and authors-file
  2018-03-11 13:58 ` [PATCH v2 2/2] git-svn: allow empty email-address in authors-prog and authors-file Andreas Heiduk
@ 2018-03-18 23:04   ` Eric Wong
  2018-03-19 22:48     ` Andreas Heiduk
  0 siblings, 1 reply; 13+ messages in thread
From: Eric Wong @ 2018-03-18 23:04 UTC (permalink / raw)
  To: Andreas Heiduk; +Cc: git, Eric Sunshine

Andreas Heiduk <asheiduk@gmail.com> wrote:
> The email address in --authors-file and --authors-prog can be empty but
> git-svn translated it into a syntethic email address in the form
> $USERNAME@$REPO_UUID. Now git-svn behaves like git-commit: If the email
> is explicitly set to the empty string, the commit does not contain
> an email address.

What is missing is WHY "<>" is preferable to "<$USERNAME@$REPO_UUID>".

$USERNAME is good anyways since projects/organizations tie their
SVN usernames to email usernames via LDAP, making it easy to
infer their email address from $USERNAME.  The latter can also
be used to disambiguate authors if they happen to have the same
real name.

"<>" is completely meaningless.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v2 2/2] git-svn: allow empty email-address in authors-prog and authors-file
  2018-03-18 23:04   ` Eric Wong
@ 2018-03-19 22:48     ` Andreas Heiduk
  2018-03-20 22:07       ` Eric Wong
  0 siblings, 1 reply; 13+ messages in thread
From: Andreas Heiduk @ 2018-03-19 22:48 UTC (permalink / raw)
  To: Eric Wong; +Cc: git, Eric Sunshine

Am 19.03.2018 um 00:04 schrieb Eric Wong:
> Andreas Heiduk <asheiduk@gmail.com> wrote:
>> The email address in --authors-file and --authors-prog can be empty but
>> git-svn translated it into a syntethic email address in the form
>> $USERNAME@$REPO_UUID. Now git-svn behaves like git-commit: If the email
>> is explicitly set to the empty string, the commit does not contain
>> an email address.
> 
> What is missing is WHY "<>" is preferable to "<$USERNAME@$REPO_UUID>".
>
> $USERNAME is good anyways since projects/organizations tie their
> SVN usernames to email usernames via LDAP, making it easy to
> infer their email address from $USERNAME.  The latter can also
> be used to disambiguate authors if they happen to have the same
> real name.

That's still available and it's even still the default.

But: If the user of git-svn takes the burden of writing an authors
script or maintaining an authors file then he should have full control
over the result as long as git can handle the output reasonably.
Currently that's the case for git but not for git-svn.

Git can handle empty emails quite nicely:

    > git -c user.email= commit --allow-empty -m "foo"
    > git show --format=raw HEAD | egrep "author|committer"
    author jondoe <> 1521495217 +0100
    committer jondoe <> 1521495217 +0100

Doing the same with current git-svn requires a filter-branch followed
by `rm -r .git/svn/`  followed by `git svn fetch` to recreate the
rev_map files. That would be feasible for a one-time conversion but
not in a situation where SVN is live and the master repository.

>
> "<>" is completely meaningless.
>

Not quite. The "<>" is not the only information - there is still the
mandatory "name" part. So the commit id

    jondoe <>

just means: "There is intentionally no email address." For an
internal, ephemeral repository that can be OK. It has the advantage,
that no automatic system (Jira, Jenkins, ...) will try to send emails to 

    jondoe <jondoe@6aafaa21e0fb4338a68ab372a049893d>

Additionally the log output isn't cluttered with irrelevant stuff. :-)

And last but not least we don't have to hunt down names long gone by and
already deleted in LDAP. In that case the UUID doesn't help either.


Further steps: Eric Sunshine mentioned [1] that you might have concerns about
the change of behavior per se. For me the patch is not so much a new feature but
a bugfix bringing git-svn in sync with git itself. Adding an option parameter 
to enable the new behavior seems strange to me. But there might be other ways
to achieve the same effect:

- changing the output format of the file and prog: empty emails could be 
  marked by a syntax which is invalid so far.

- OR (if some change of behaviour is acceptable) the script could evaluate
  a new environment variable like GIT_SVN_UUID to compose the 
  `<$user@$uuid>` part itself.

- OR just mention it in the relaese notes ;-)

- OR [please insert ideas here]


[1] https://public-inbox.org/git/CAPig+cQ1Si-AvazF_1Kf4yX9+eGD9tGUdvP7npJ3uYxy1pLy2w@mail.gmail.com/

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v2 2/2] git-svn: allow empty email-address in authors-prog and authors-file
  2018-03-19 22:48     ` Andreas Heiduk
@ 2018-03-20 22:07       ` Eric Wong
  2018-03-24 10:20         ` [PATCH v3] git-svn: allow empty email-address using " Andreas Heiduk
  0 siblings, 1 reply; 13+ messages in thread
From: Eric Wong @ 2018-03-20 22:07 UTC (permalink / raw)
  To: Andreas Heiduk; +Cc: git, Eric Sunshine

Andreas Heiduk <asheiduk@gmail.com> wrote:
> Am 19.03.2018 um 00:04 schrieb Eric Wong:
> > Andreas Heiduk <asheiduk@gmail.com> wrote:
> >> The email address in --authors-file and --authors-prog can be empty but
> >> git-svn translated it into a syntethic email address in the form
> >> $USERNAME@$REPO_UUID. Now git-svn behaves like git-commit: If the email
> >> is explicitly set to the empty string, the commit does not contain
> >> an email address.
> > 
> > What is missing is WHY "<>" is preferable to "<$USERNAME@$REPO_UUID>".
> >
> > $USERNAME is good anyways since projects/organizations tie their
> > SVN usernames to email usernames via LDAP, making it easy to
> > infer their email address from $USERNAME.  The latter can also
> > be used to disambiguate authors if they happen to have the same
> > real name.
> 
> That's still available and it's even still the default.

OK.

> But: If the user of git-svn takes the burden of writing an authors
> script or maintaining an authors file then he should have full control
> over the result as long as git can handle the output reasonably.
> Currently that's the case for git but not for git-svn.

Fair enough.

>     jondoe <>
> 
> just means: "There is intentionally no email address." For an
> internal, ephemeral repository that can be OK. It has the advantage,
> that no automatic system (Jira, Jenkins, ...) will try to send emails to 
> 
>     jondoe <jondoe@6aafaa21e0fb4338a68ab372a049893d>

OK, that's a good reason to allow "<>" and should be in the
commit message.

> Further steps: Eric Sunshine mentioned [1] that you might have concerns about
> the change of behavior per se. For me the patch is not so much a new feature but
> a bugfix bringing git-svn in sync with git itself. Adding an option parameter 
> to enable the new behavior seems strange to me. But there might be other ways
> to achieve the same effect:

New options are not desirable, either, as they increase
testing/maintenance overhead.  So I'm inclined to take your
patch with only an updated commit message...

No rush, though; will wait another bit for others to comment and
I expect to be preoccupied this week with other projects and
weather problems on the forecast :<

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v3] git-svn: allow empty email-address using authors-prog and authors-file
  2018-03-20 22:07       ` Eric Wong
@ 2018-03-24 10:20         ` " Andreas Heiduk
  2018-04-05  7:51           ` Eric Wong
  0 siblings, 1 reply; 13+ messages in thread
From: Andreas Heiduk @ 2018-03-24 10:20 UTC (permalink / raw)
  To: Git Mailing List, Eric Wong; +Cc: sunshine, Andreas Heiduk

The email address in --authors-file and --authors-prog can be empty but
git-svn translated it into a fictional email address in the form

	jondoe <jondoe@6aafaa21e0fb4338a68ab372a049893d>

containing the SVN repository UUID. Now git-svn behaves like git-commit:
If the email is *explicitly* set to the empty string using '<>', the
commit does not contain an email address, only the name:

	jondoe <>

Allowing to remove the email address *intentionally* prevents automatic
systems from sending emails to those fictional addresses and avoids
cluttering the log output with unnecessary stuff.

Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
---
 Documentation/git-svn.txt       |  8 +++++---
 perl/Git/SVN.pm                 | 13 ++++++-------
 t/t9130-git-svn-authors-file.sh | 14 ++++++++++++++
 t/t9138-git-svn-authors-prog.sh | 25 ++++++++++++++++++++++++-
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index b858374649..d59379ee23 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -635,7 +635,8 @@ config key: svn.findcopiesharder
 
 -A<filename>::
 --authors-file=<filename>::
-	Syntax is compatible with the file used by 'git cvsimport':
+	Syntax is compatible with the file used by 'git cvsimport' but
+	an empty email address can be supplied with '<>':
 +
 ------------------------------------------------------------------------
 	loginname = Joe User <user@example.com>
@@ -654,8 +655,9 @@ config key: svn.authorsfile
 	If this option is specified, for each SVN committer name that
 	does not exist in the authors file, the given file is executed
 	with the committer name as the first argument.  The program is
-	expected to return a single line of the form "Name <email>",
-	which will be treated as if included in the authors file.
+	expected to return a single line of the form "Name <email>" or
+	"Name <>", which will be treated as if included in the authors
+	file.
 +
 Due to historical reasons a relative 'filename' is first searched
 relative to the current directory for 'init' and 'clone' and relative
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index bc4eed3d75..945ca4db2b 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1482,7 +1482,6 @@ sub call_authors_prog {
 	}
 	if ($author =~ /^\s*(.+?)\s*<(.*)>\s*$/) {
 		my ($name, $email) = ($1, $2);
-		$email = undef if length $2 == 0;
 		return [$name, $email];
 	} else {
 		die "Author: $orig_author: $::_authors_prog returned "
@@ -2020,8 +2019,8 @@ sub make_log_entry {
 		remove_username($full_url);
 		$log_entry{metadata} = "$full_url\@$r $uuid";
 		$log_entry{svm_revision} = $r;
-		$email ||= "$author\@$uuid";
-		$commit_email ||= "$author\@$uuid";
+		$email = "$author\@$uuid" unless defined $email;
+		$commit_email = "$author\@$uuid" unless defined $commit_email;
 	} elsif ($self->use_svnsync_props) {
 		my $full_url = canonicalize_url(
 			add_path_to_url( $self->svnsync->{url}, $self->path )
@@ -2029,15 +2028,15 @@ sub make_log_entry {
 		remove_username($full_url);
 		my $uuid = $self->svnsync->{uuid};
 		$log_entry{metadata} = "$full_url\@$rev $uuid";
-		$email ||= "$author\@$uuid";
-		$commit_email ||= "$author\@$uuid";
+		$email = "$author\@$uuid" unless defined $email;
+		$commit_email = "$author\@$uuid" unless defined $commit_email;
 	} else {
 		my $url = $self->metadata_url;
 		remove_username($url);
 		my $uuid = $self->rewrite_uuid || $self->ra->get_uuid;
 		$log_entry{metadata} = "$url\@$rev " . $uuid;
-		$email ||= "$author\@" . $uuid;
-		$commit_email ||= "$author\@" . $uuid;
+		$email = "$author\@$uuid" unless defined $email;
+		$commit_email = "$author\@$uuid" unless defined $commit_email;
 	}
 	$log_entry{name} = $name;
 	$log_entry{email} = $email;
diff --git a/t/t9130-git-svn-authors-file.sh b/t/t9130-git-svn-authors-file.sh
index 41264818cc..6af6daf461 100755
--- a/t/t9130-git-svn-authors-file.sh
+++ b/t/t9130-git-svn-authors-file.sh
@@ -108,6 +108,20 @@ test_expect_success !MINGW 'fresh clone with svn.authors-file in config' '
 	)
 '
 
+cat >> svn-authors <<EOF
+ff = FFFFFFF FFFFFFF <>
+EOF
+
+test_expect_success 'authors-file imported user without email' '
+	svn_cmd mkdir -m aa/branches/ff --username ff "$svnrepo/aa/branches/ff" &&
+	(
+		cd aa-work &&
+		git svn fetch --authors-file=../svn-authors &&
+		git rev-list -1 --pretty=raw refs/remotes/origin/ff | \
+		  grep "^author FFFFFFF FFFFFFF <> "
+	)
+	'
+
 test_debug 'GIT_DIR=gitconfig.clone/.git git log'
 
 test_done
diff --git a/t/t9138-git-svn-authors-prog.sh b/t/t9138-git-svn-authors-prog.sh
index 7d7e9d46bc..0cec56128f 100755
--- a/t/t9138-git-svn-authors-prog.sh
+++ b/t/t9138-git-svn-authors-prog.sh
@@ -9,7 +9,9 @@ test_description='git svn authors prog tests'
 
 write_script svn-authors-prog "$PERL_PATH" <<-\EOF
 	$_ = shift;
-	if (s/-sub$//)  {
+	if (s/-hermit//) {
+		print "$_ <>\n";
+	} elsif (s/-sub$//)  {
 		print "$_ <$_\@sub.example.com>\n";
 	} else {
 		print "$_ <$_\@example.com>\n";
@@ -68,6 +70,27 @@ test_expect_success 'authors-file overrode authors-prog' '
 git --git-dir=x/.git config --unset svn.authorsfile
 git --git-dir=x/.git config --unset svn.authorsprog
 
+test_expect_success 'authors-prog imported user without email' '
+	svn mkdir -m gg --username gg-hermit "$svnrepo"/gg &&
+	(
+		cd x &&
+		git svn fetch --authors-prog=../svn-authors-prog &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn | \
+		  grep "^author gg <> "
+	)
+'
+
+test_expect_success 'imported without authors-prog and authors-file' '
+	svn mkdir -m hh --username hh "$svnrepo"/hh &&
+	(
+		uuid=$(svn info --show-item=repos-uuid "$svnrepo") &&
+		cd x &&
+		git svn fetch &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn | \
+		  grep "^author hh <hh@$uuid> "
+	)
+'
+
 test_expect_success 'authors-prog handled special characters in username' '
 	svn mkdir -m bad --username "xyz; touch evil" "$svnrepo"/bad &&
 	(
-- 
2.16.2


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v3] git-svn: allow empty email-address using authors-prog and authors-file
  2018-03-24 10:20         ` [PATCH v3] git-svn: allow empty email-address using " Andreas Heiduk
@ 2018-04-05  7:51           ` Eric Wong
  2018-04-05 18:23             ` Andreas Heiduk
  0 siblings, 1 reply; 13+ messages in thread
From: Eric Wong @ 2018-04-05  7:51 UTC (permalink / raw)
  To: Andreas Heiduk; +Cc: git, Eric Sunshine

Thanks for the update.  The patch itself looks good, but I
noticed one --show-item isn't supported on SVN 1.8.10 for me.

I've tested the following on both SVN 1.8.10 and 1.9.5:

--- a/t/t9138-git-svn-authors-prog.sh
+++ b/t/t9138-git-svn-authors-prog.sh
@@ -83,7 +83,8 @@ test_expect_success 'authors-prog imported user without email' '
 test_expect_success 'imported without authors-prog and authors-file' '
 	svn mkdir -m hh --username hh "$svnrepo"/hh &&
 	(
-		uuid=$(svn info --show-item=repos-uuid "$svnrepo") &&
+		uuid=$(svn info "$svnrepo" |
+			sed -n "s/^Repository UUID: //p") &&
 		cd x &&
 		git svn fetch &&
 		git rev-list -1 --pretty=raw refs/remotes/git-svn | \

Can you confirm it's OK for you?  Thanks.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v3] git-svn: allow empty email-address using authors-prog and authors-file
  2018-04-05  7:51           ` Eric Wong
@ 2018-04-05 18:23             ` Andreas Heiduk
  2018-04-05 19:44               ` Eric Wong
  0 siblings, 1 reply; 13+ messages in thread
From: Andreas Heiduk @ 2018-04-05 18:23 UTC (permalink / raw)
  To: Eric Wong; +Cc: git, Eric Sunshine

Am 05.04.2018 um 09:51 schrieb Eric Wong:
> Thanks for the update.  The patch itself looks good, but I
> noticed one --show-item isn't supported on SVN 1.8.10 for me.

--show-item is indeed a 1.9.0 thing:

https://subversion.apache.org/docs/release-notes/1.9.html#svn-info-item

> I've tested the following on both SVN 1.8.10 and 1.9.5:
> 
> --- a/t/t9138-git-svn-authors-prog.sh
> +++ b/t/t9138-git-svn-authors-prog.sh
> @@ -83,7 +83,8 @@ test_expect_success 'authors-prog imported user without email' '
>  test_expect_success 'imported without authors-prog and authors-file' '
>  	svn mkdir -m hh --username hh "$svnrepo"/hh &&
>  	(
> -		uuid=$(svn info --show-item=repos-uuid "$svnrepo") &&
> +		uuid=$(svn info "$svnrepo" |
> +			sed -n "s/^Repository UUID: //p") &&
>  		cd x &&
>  		git svn fetch &&
>  		git rev-list -1 --pretty=raw refs/remotes/git-svn | \
> 
> Can you confirm it's OK for you?  Thanks.

Looks good, works for me.

Do you squash this patch with with my commit or do you need a reroll?

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v3] git-svn: allow empty email-address using authors-prog and authors-file
  2018-04-05 18:23             ` Andreas Heiduk
@ 2018-04-05 19:44               ` Eric Wong
  2018-04-11 23:18                 ` Junio C Hamano
  0 siblings, 1 reply; 13+ messages in thread
From: Eric Wong @ 2018-04-05 19:44 UTC (permalink / raw)
  To: Junio C Hamano, Andreas Heiduk; +Cc: git, Eric Sunshine

Andreas Heiduk <asheiduk@gmail.com> wrote:
> Am 05.04.2018 um 09:51 schrieb Eric Wong:
> > Can you confirm it's OK for you?  Thanks.
> 
> Looks good, works for me.
> 
> Do you squash this patch with with my commit or do you need a reroll?

Nope, no need to reroll.  Pushed to my repo for Junio.  Thanks all.

The following changes since commit 468165c1d8a442994a825f3684528361727cd8c0:

  Git 2.17 (2018-04-02 10:13:35 -0700)

are available in the Git repository at:

  git://bogomips.org/git-svn.git svn/authors-prog-2

for you to fetch changes up to cb427e9eb0243fe7a1a22ea3bd0a46b7410c0bf3:

  git-svn: allow empty email-address using authors-prog and authors-file (2018-04-05 19:22:06 +0000)

----------------------------------------------------------------
Andreas Heiduk (2):
      git-svn: search --authors-prog in PATH too
      git-svn: allow empty email-address using authors-prog and authors-file

 Documentation/git-svn.txt       | 13 ++++++++++---
 git-svn.perl                    |  3 ++-
 perl/Git/SVN.pm                 | 13 ++++++-------
 t/t9130-git-svn-authors-file.sh | 14 ++++++++++++++
 t/t9138-git-svn-authors-prog.sh | 26 +++++++++++++++++++++++++-
 5 files changed, 57 insertions(+), 12 deletions(-)

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v3] git-svn: allow empty email-address using authors-prog and authors-file
  2018-04-05 19:44               ` Eric Wong
@ 2018-04-11 23:18                 ` Junio C Hamano
  0 siblings, 0 replies; 13+ messages in thread
From: Junio C Hamano @ 2018-04-11 23:18 UTC (permalink / raw)
  To: Eric Wong; +Cc: Andreas Heiduk, git, Eric Sunshine

Eric Wong <e@80x24.org> writes:

> Andreas Heiduk <asheiduk@gmail.com> wrote:
>> Am 05.04.2018 um 09:51 schrieb Eric Wong:
>> > Can you confirm it's OK for you?  Thanks.
>> 
>> Looks good, works for me.
>> 
>> Do you squash this patch with with my commit or do you need a reroll?
>
> Nope, no need to reroll.  Pushed to my repo for Junio.  Thanks all.
>
> The following changes since commit 468165c1d8a442994a825f3684528361727cd8c0:
>
>   Git 2.17 (2018-04-02 10:13:35 -0700)
>
> are available in the Git repository at:
>
>   git://bogomips.org/git-svn.git svn/authors-prog-2
>
> for you to fetch changes up to cb427e9eb0243fe7a1a22ea3bd0a46b7410c0bf3:
>
>   git-svn: allow empty email-address using authors-prog and authors-file (2018-04-05 19:22:06 +0000)

Sorry; this message fell under my radar and I had to privately get
reminded of it.  Pulled.

Thanks, both.

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, back to index

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20180304112237.19254-1-asheiduk@gmail.co>
2018-03-11 13:58 ` [PATCH v2 0/2] git-svn: --author-prog improvements Andreas Heiduk
2018-03-18 21:19   ` Andreas Heiduk
2018-03-18 21:31     ` Eric Sunshine
2018-03-11 13:58 ` [PATCH v2 1/2] git-svn: search --authors-prog in PATH too Andreas Heiduk
2018-03-11 13:58 ` [PATCH v2 2/2] git-svn: allow empty email-address in authors-prog and authors-file Andreas Heiduk
2018-03-18 23:04   ` Eric Wong
2018-03-19 22:48     ` Andreas Heiduk
2018-03-20 22:07       ` Eric Wong
2018-03-24 10:20         ` [PATCH v3] git-svn: allow empty email-address using " Andreas Heiduk
2018-04-05  7:51           ` Eric Wong
2018-04-05 18:23             ` Andreas Heiduk
2018-04-05 19:44               ` Eric Wong
2018-04-11 23:18                 ` Junio C Hamano

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox