git-svn: test that extra blank lines aren't inserted in commit messages.

Improve the git-svn-author test to check that extra newlines aren't inserted
into commit messages as they take a round trip from git to svn and back.

We test both with and without the --add-author-from option to git-svn.

git-svn: test that svn repo doesn't have extra newlines.

Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t9122-git-svn-author.sh b/t/t9122-git-svn-author.sh
index 8c58f0b8d7488732d25fd1d154b6c5459f5d080e..1190576a658d08a680e177b748cfc5e69caa3ddb 100755 (executable)
--- a/t/t9122-git-svn-author.sh
+++ b/t/t9122-git-svn-author.sh
@@ -64,7 +64,21 @@ test_expect_success 'interact with it via git-svn' '
 
        # Make sure --add-author-from with --use-log-author affected
        # the authorship information
 
        # Make sure --add-author-from with --use-log-author affected
        # the authorship information

-       grep "^Author: A U Thor " actual.4
+       grep "^Author: A U Thor " actual.4 &&
+
+       # Make sure there are no commit messages with excess blank lines
+       test $(grep "^ " actual.2 | wc -l) = 3 &&
+       test $(grep "^ " actual.3 | wc -l) = 5 &&
+       test $(grep "^ " actual.4 | wc -l) = 5 &&
+
+       # Make sure there are no svn commit messages with excess blank lines
+       (
+               cd work.svn &&
+               svn up &&
+               
+               test $(svn log -r2:2 | wc -l) = 5 &&
+               test $(svn log -r4:4 | wc -l) = 7
+       )

 '
 
 test_done
 '
 
 test_done