undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t9138-git-svn-authors-prog.sh fixups

Browse Source 
Several fixups of the t9138-git-svn-authors-prog.sh test script to
follow current recommendations in t/README.

  - Fixed a Perl script with a full "#!/usr/bin/perl" shebang
    to use write_script() and $PERL_PATH as per t/README.

  - Placed svn-authors data setup inside a test_expect_success.

  - Fixed trailing quotes to use the same indentation throughout.

Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeremiah Mahler 2014-05-25 12:24:54 -07:00 committed by Junio C Hamano
parent 4a28f169ad
commit 01730a3bb4
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
t/t9138-git-svn-authors-prog.sh
View File

@ -7,40 +7,39 @@ test_description='git svn authors prog tests'
. ./lib-git-svn.sh . ./lib-git-svn.sh
cat > svn-authors-prog <<'EOF' write_script svn-authors-prog "$PERL_PATH" <<-\EOF
#!/usr/bin/perl $_ = shift;
$_ = shift; if (s/-sub$//) {
if (s/-sub$//) { print "$_ <$_\@sub.example.com>\n";
print "$_ <$_\@sub.example.com>\n"; } else {
} print "$_ <$_\@example.com>\n";
else { }
print "$_ <$_\@example.com>\n";
}
EOF EOF
chmod +x svn-authors-prog
cat > svn-authors <<'EOF' test_expect_success 'svn-authors setup' '
ff = FFFFFFF FFFFFFF <fFf@other.example.com> cat >svn-authors <<-\EOF
EOF ff = FFFFFFF FFFFFFF <fFf@other.example.com>
EOF
'
test_expect_success 'setup svnrepo' ' test_expect_success 'setup svnrepo' '
for i in aa bb cc-sub dd-sub ee-foo ff for i in aa bb cc-sub dd-sub ee-foo ff
do do
svn mkdir -m $i --username $i "$svnrepo"/$i svn mkdir -m $i --username $i "$svnrepo"/$i
done done
' '
test_expect_success 'import authors with prog and file' ' test_expect_success 'import authors with prog and file' '
git svn clone --authors-prog=./svn-authors-prog \ git svn clone --authors-prog=./svn-authors-prog \
--authors-file=svn-authors "$svnrepo" x --authors-file=svn-authors "$svnrepo" x
' '
test_expect_success 'imported 6 revisions successfully' ' test_expect_success 'imported 6 revisions successfully' '
( (
cd x cd x
test "`git rev-list refs/remotes/git-svn | wc -l`" -eq 6 test "`git rev-list refs/remotes/git-svn | wc -l`" -eq 6
) )
' '
test_expect_success 'authors-prog ran correctly' ' test_expect_success 'authors-prog ran correctly' '
( (
@ -56,7 +55,7 @@ test_expect_success 'authors-prog ran correctly' '
git rev-list -1 --pretty=raw refs/remotes/git-svn~5 | \ git rev-list -1 --pretty=raw refs/remotes/git-svn~5 | \
grep "^author aa <aa@example\.com> " grep "^author aa <aa@example\.com> "
) )
' '
test_expect_success 'authors-file overrode authors-prog' ' test_expect_success 'authors-file overrode authors-prog' '
( (
@ -64,7 +63,7 @@ test_expect_success 'authors-file overrode authors-prog' '
git rev-list -1 --pretty=raw refs/remotes/git-svn | \ git rev-list -1 --pretty=raw refs/remotes/git-svn | \
grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> " grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> "
) )
' '
git --git-dir=x/.git config --unset svn.authorsfile git --git-dir=x/.git config --unset svn.authorsfile
git --git-dir=x/.git config --unset svn.authorsprog git --git-dir=x/.git config --unset svn.authorsprog