From cb427e9eb0243fe7a1a22ea3bd0a46b7410c0bf3 Mon Sep 17 00:00:00 2001 From: Andreas Heiduk Date: Sat, 24 Mar 2018 11:20:46 +0100 Subject: git-svn: allow empty email-address using authors-prog and authors-file 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 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 Signed-off-by: Eric Wong --- t/t9130-git-svn-authors-file.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 't/t9130-git-svn-authors-file.sh') 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 + +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 -- cgit 1.2.3-korg