]> git.ipfire.org Git - thirdparty/git.git/blame - t/t9600-cvsimport.sh
Merge branch 'jk/complete-commit-c' into maint
[thirdparty/git.git] / t / t9600-cvsimport.sh
CommitLineData
795c7c0b
JK
1#!/bin/sh
2
f964732c 3test_description='git cvsimport basic tests'
535bb893 4. ./lib-cvs.sh
795c7c0b 5
900eab44
ÆAB
6test_expect_success PERL 'setup cvsroot environment' '
7 CVSROOT=$(pwd)/cvsroot &&
8 export CVSROOT
9'
dcbcb707 10
900eab44 11test_expect_success PERL 'setup cvsroot' '$CVS init'
795c7c0b 12
900eab44 13test_expect_success PERL 'setup a cvs module' '
795c7c0b 14
f69e836f 15 mkdir "$CVSROOT/module" &&
161261b1 16 $CVS co -d module-cvs module &&
fd4ec4f2 17 (cd module-cvs &&
795c7c0b
JK
18 cat <<EOF >o_fortuna &&
19O Fortuna
20velut luna
21statu variabilis,
22
23semper crescis
24aut decrescis;
25vita detestabilis
26
27nunc obdurat
28et tunc curat
29ludo mentis aciem,
30
31egestatem,
32potestatem
33dissolvit ut glaciem.
34EOF
161261b1 35 $CVS add o_fortuna &&
795c7c0b
JK
36 cat <<EOF >message &&
37add "O Fortuna" lyrics
38
39These public domain lyrics make an excellent sample text.
40EOF
fd4ec4f2
JL
41 $CVS commit -F message
42 )
795c7c0b
JK
43'
44
900eab44 45test_expect_success PERL 'import a trivial module' '
795c7c0b 46
0455ec03 47 git cvsimport -a -R -z 0 -C module-git module &&
3af82863 48 test_cmp module-cvs/o_fortuna module-git/o_fortuna
795c7c0b
JK
49
50'
51
347c47e6 52test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
9da0dabc 53
900eab44 54test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
0455ec03
AC
55
56 (cd module-git &&
57 git log --format="o_fortuna 1.1 %H" -1) > expected &&
58 test_cmp expected module-git/.git/cvs-revisions
59'
60
900eab44 61test_expect_success PERL 'update cvs module' '
fd4ec4f2 62 (cd module-cvs &&
795c7c0b
JK
63 cat <<EOF >o_fortuna &&
64O Fortune,
65like the moon
66you are changeable,
67
68ever waxing
69and waning;
70hateful life
71
72first oppresses
73and then soothes
74as fancy takes it;
75
76poverty
77and power
78it melts them like ice.
79EOF
80 cat <<EOF >message &&
81translate to English
82
83My Latin is terrible.
84EOF
fd4ec4f2
JL
85 $CVS commit -F message
86 )
795c7c0b
JK
87'
88
900eab44 89test_expect_success PERL 'update git module' '
795c7c0b 90
fd4ec4f2 91 (cd module-git &&
60d5985d
MG
92 git config cvsimport.trackRevisions true &&
93 git cvsimport -a -z 0 module &&
fd4ec4f2
JL
94 git merge origin
95 ) &&
3af82863 96 test_cmp module-cvs/o_fortuna module-git/o_fortuna
795c7c0b
JK
97
98'
99
900eab44 100test_expect_success PERL 'update has correct .git/cvs-revisions' '
0455ec03
AC
101
102 (cd module-git &&
103 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
104 git log --format="o_fortuna 1.2 %H" -1 HEAD) > expected &&
105 test_cmp expected module-git/.git/cvs-revisions
106'
107
900eab44 108test_expect_success PERL 'update cvs module' '
67d23242 109
fd4ec4f2 110 (cd module-cvs &&
67d23242 111 echo 1 >tick &&
161261b1
MH
112 $CVS add tick &&
113 $CVS commit -m 1
fd4ec4f2 114 )
67d23242
JK
115'
116
900eab44 117test_expect_success PERL 'cvsimport.module config works' '
67d23242 118
fd4ec4f2 119 (cd module-git &&
67d23242 120 git config cvsimport.module module &&
60d5985d
MG
121 git config cvsimport.trackRevisions true &&
122 git cvsimport -a -z0 &&
fd4ec4f2
JL
123 git merge origin
124 ) &&
3af82863 125 test_cmp module-cvs/tick module-git/tick
67d23242
JK
126
127'
128
900eab44 129test_expect_success PERL 'second update has correct .git/cvs-revisions' '
0455ec03
AC
130
131 (cd module-git &&
132 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
133 git log --format="o_fortuna 1.2 %H" -1 HEAD^
134 git log --format="tick 1.1 %H" -1 HEAD) > expected &&
135 test_cmp expected module-git/.git/cvs-revisions
136'
137
900eab44 138test_expect_success PERL 'import from a CVS working tree' '
4e596e98 139
161261b1 140 $CVS co -d import-from-wt module &&
fd4ec4f2 141 (cd import-from-wt &&
60d5985d 142 git config cvsimport.trackRevisions false &&
4e596e98
JK
143 git cvsimport -a -z0 &&
144 echo 1 >expect &&
145 git log -1 --pretty=format:%s%n >actual &&
fd4ec4f2
JL
146 test_cmp actual expect
147 )
4e596e98
JK
148
149'
150
900eab44 151test_expect_success PERL 'no .git/cvs-revisions created by default' '
0455ec03
AC
152
153 ! test -e import-from-wt/.git/cvs-revisions
154
155'
156
900eab44 157test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
cefa318d 158
795c7c0b 159test_done