]> asedeno.scripts.mit.edu Git - git.git/commitdiff
git-svn: add test for --add-author-from and --use-log-author
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 May 2008 00:09:49 +0000 (17:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 May 2008 00:09:49 +0000 (17:09 -0700)
This adds a minimalistic set of tests to recently added --add-author-from
option and existing --use-log-author option to git-svn.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t9122-git-svn-author.sh [new file with mode: 0755]

diff --git a/t/t9122-git-svn-author.sh b/t/t9122-git-svn-author.sh
new file mode 100755 (executable)
index 0000000..8c58f0b
--- /dev/null
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+test_description='git svn authorship'
+. ./lib-git-svn.sh
+
+test_expect_success 'setup svn repository' '
+       svn checkout "$svnrepo" work.svn &&
+       (
+               cd work.svn &&
+               echo >file
+               svn add file
+               svn commit -m "first commit" file
+       )
+'
+
+test_expect_success 'interact with it via git-svn' '
+       mkdir work.git &&
+       (
+               cd work.git &&
+               git svn init "$svnrepo"
+               git svn fetch &&
+
+               echo modification >file &&
+               test_tick &&
+               git commit -a -m second &&
+
+               test_tick &&
+               git svn dcommit &&
+
+               echo "further modification" >file &&
+               test_tick &&
+               git commit -a -m third &&
+
+               test_tick &&
+               git svn --add-author-from dcommit &&
+
+               echo "yet further modification" >file &&
+               test_tick &&
+               git commit -a -m fourth &&
+
+               test_tick &&
+               git svn --add-author-from --use-log-author dcommit &&
+
+               git log &&
+
+               git show -s HEAD^^ >../actual.2 &&
+               git show -s HEAD^  >../actual.3 &&
+               git show -s HEAD   >../actual.4
+
+       ) &&
+
+       # Make sure that --add-author-from without --use-log-author
+       # did not affect the authorship information
+       myself=$(grep "^Author: " actual.2) &&
+       unaffected=$(grep "^Author: " actual.3) &&
+       test "z$myself" = "z$unaffected" &&
+
+       # Make sure lack of --add-author-from did not add cruft
+       ! grep "^    From: A U Thor " actual.2 &&
+
+       # Make sure --add-author-from added cruft
+       grep "^    From: A U Thor " actual.3 &&
+       grep "^    From: A U Thor " actual.4 &&
+
+       # Make sure --add-author-from with --use-log-author affected
+       # the authorship information
+       grep "^Author: A U Thor " actual.4
+'
+
+test_done