diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-04-12 08:05:28 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-04-12 08:05:28 +0900 |
commit | fe0a9eaf31dd0c349ae4308498c33a5c3794b293 (patch) | |
tree | d58beeacadce08282804ab8c99d258d5fa0033c7 /t/t9130-git-svn-authors-file.sh | |
parent | Revert "Merge branch 'en/rename-directory-detection'" (diff) | |
parent | git-svn: allow empty email-address using authors-prog and authors-file (diff) | |
download | tgif-fe0a9eaf31dd0c349ae4308498c33a5c3794b293.tar.xz |
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-x | t/t9130-git-svn-authors-file.sh | 14 |
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 7752a1faeb..d8262854bb 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 |