summaryrefslogtreecommitdiff
path: root/t/t9138-git-svn-authors-prog.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/t9138-git-svn-authors-prog.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/t9138-git-svn-authors-prog.sh')
-rwxr-xr-xt/t9138-git-svn-authors-prog.sh26
1 files changed, 25 insertions, 1 deletions
diff --git a/t/t9138-git-svn-authors-prog.sh b/t/t9138-git-svn-authors-prog.sh
index 48109f9..93ef44f 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";
@@ -69,6 +71,28 @@ 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 "$svnrepo" |
+ sed -n "s/^Repository UUID: //p") &&
+ 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 &&
(