summaryrefslogtreecommitdiff
path: root/t/t9130-git-svn-authors-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-04-11 23:05:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-11 23:05:28 (GMT)
commitfe0a9eaf31dd0c349ae4308498c33a5c3794b293 (patch)
treed58beeacadce08282804ab8c99d258d5fa0033c7 /t/t9130-git-svn-authors-file.sh
parent8b026edac3104ecc40a68fd58b764fb3c717babb (diff)
parentcb427e9eb0243fe7a1a22ea3bd0a46b7410c0bf3 (diff)
downloadgit-fe0a9eaf31dd0c349ae4308498c33a5c3794b293.zip
git-fe0a9eaf31dd0c349ae4308498c33a5c3794b293.tar.gz
git-fe0a9eaf31dd0c349ae4308498c33a5c3794b293.tar.bz2
Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn
* 'svn/authors-prog-2' of git://bogomips.org/git-svn: git-svn: allow empty email-address using authors-prog and authors-file git-svn: search --authors-prog in PATH too
Diffstat (limited to 't/t9130-git-svn-authors-file.sh')
-rwxr-xr-xt/t9130-git-svn-authors-file.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t9130-git-svn-authors-file.sh b/t/t9130-git-svn-authors-file.sh
index 7752a1f..d826285 100755
--- a/t/t9130-git-svn-authors-file.sh
+++ b/t/t9130-git-svn-authors-file.sh
@@ -112,6 +112,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