From c8c6a2ecb48d717fe2735bf7790226021380d520 Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Thu, 12 Jun 2008 19:10:51 -0400 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- t/t9122-git-svn-author.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/t/t9122-git-svn-author.sh b/t/t9122-git-svn-author.sh index 8c58f0b8d7..1190576a65 100755 --- 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 - 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 -- 2.11.4.GIT