git am: ignore dirty submodules
[git/mingw/4msysgit/kblees.git] / t / t9600-cvsimport.sh
blobb572ce3ab7f55e1258aa92b37e10a0d067c9d01d
1 #!/bin/sh
3 test_description='git cvsimport basic tests'
4 . ./lib-cvs.sh
6 if ! test_have_prereq PERL; then
7 say 'skipping git cvsimport tests, perl not available'
8 test_done
9 fi
11 CVSROOT=$(pwd)/cvsroot
12 export CVSROOT
14 test_expect_success 'setup cvsroot' '$CVS init'
16 test_expect_success 'setup a cvs module' '
18 mkdir "$CVSROOT/module" &&
19 $CVS co -d module-cvs module &&
20 cd module-cvs &&
21 cat <<EOF >o_fortuna &&
22 O Fortuna
23 velut luna
24 statu variabilis,
26 semper crescis
27 aut decrescis;
28 vita detestabilis
30 nunc obdurat
31 et tunc curat
32 ludo mentis aciem,
34 egestatem,
35 potestatem
36 dissolvit ut glaciem.
37 EOF
38 $CVS add o_fortuna &&
39 cat <<EOF >message &&
40 add "O Fortuna" lyrics
42 These public domain lyrics make an excellent sample text.
43 EOF
44 $CVS commit -F message &&
45 cd ..
48 test_expect_success 'import a trivial module' '
50 git cvsimport -a -R -z 0 -C module-git module &&
51 test_cmp module-cvs/o_fortuna module-git/o_fortuna
55 test_expect_success 'pack refs' 'cd module-git && git gc && cd ..'
57 test_expect_success 'initial import has correct .git/cvs-revisions' '
59 (cd module-git &&
60 git log --format="o_fortuna 1.1 %H" -1) > expected &&
61 test_cmp expected module-git/.git/cvs-revisions
64 test_expect_success 'update cvs module' '
66 cd module-cvs &&
67 cat <<EOF >o_fortuna &&
68 O Fortune,
69 like the moon
70 you are changeable,
72 ever waxing
73 and waning;
74 hateful life
76 first oppresses
77 and then soothes
78 as fancy takes it;
80 poverty
81 and power
82 it melts them like ice.
83 EOF
84 cat <<EOF >message &&
85 translate to English
87 My Latin is terrible.
88 EOF
89 $CVS commit -F message &&
90 cd ..
93 test_expect_success 'update git module' '
95 cd module-git &&
96 git cvsimport -a -R -z 0 module &&
97 git merge origin &&
98 cd .. &&
99 test_cmp module-cvs/o_fortuna module-git/o_fortuna
103 test_expect_success 'update has correct .git/cvs-revisions' '
105 (cd module-git &&
106 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
107 git log --format="o_fortuna 1.2 %H" -1 HEAD) > expected &&
108 test_cmp expected module-git/.git/cvs-revisions
111 test_expect_success 'update cvs module' '
113 cd module-cvs &&
114 echo 1 >tick &&
115 $CVS add tick &&
116 $CVS commit -m 1
117 cd ..
121 test_expect_success 'cvsimport.module config works' '
123 cd module-git &&
124 git config cvsimport.module module &&
125 git cvsimport -a -R -z0 &&
126 git merge origin &&
127 cd .. &&
128 test_cmp module-cvs/tick module-git/tick
132 test_expect_success 'second update has correct .git/cvs-revisions' '
134 (cd module-git &&
135 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
136 git log --format="o_fortuna 1.2 %H" -1 HEAD^
137 git log --format="tick 1.1 %H" -1 HEAD) > expected &&
138 test_cmp expected module-git/.git/cvs-revisions
141 test_expect_success 'import from a CVS working tree' '
143 $CVS co -d import-from-wt module &&
144 cd import-from-wt &&
145 git cvsimport -a -z0 &&
146 echo 1 >expect &&
147 git log -1 --pretty=format:%s%n >actual &&
148 test_cmp actual expect &&
149 cd ..
153 test_expect_success 'no .git/cvs-revisions created by default' '
155 ! test -e import-from-wt/.git/cvs-revisions
159 test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
161 test_done