]> git.ipfire.org Git - thirdparty/git.git/blob - t/t9300-fast-import.sh
Accept 'inline' file data in fast-import commit structure.
[thirdparty/git.git] / t / t9300-fast-import.sh
1 #!/bin/sh
2 #
3 # Copyright (c) 2007 Shawn Pearce
4 #
5
6 test_description='test git-fast-import utility'
7 . ./test-lib.sh
8 . ../diff-lib.sh ;# test-lib chdir's into trash
9
10 file2_data='file2
11 second line of EOF'
12
13 file3_data='EOF
14 in 3rd file
15 END'
16
17 file4_data=abcd
18 file4_len=4
19
20 file5_data='an inline file.
21 we should see it later.'
22
23 file6_data='#!/bin/sh
24 echo "$@"'
25
26 ###
27 ### series A
28 ###
29
30 test_tick
31 cat >input <<INPUT_END
32 blob
33 mark :2
34 data <<EOF
35 $file2_data
36 EOF
37
38 blob
39 mark :3
40 data <<END
41 $file3_data
42 END
43
44 blob
45 mark :4
46 data $file4_len
47 $file4_data
48 commit refs/heads/master
49 mark :5
50 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
51 data <<COMMIT
52 initial
53 COMMIT
54
55 M 644 :2 file2
56 M 644 :3 file3
57 M 755 :4 file4
58
59 INPUT_END
60 test_expect_success \
61 'A: create pack from stdin' \
62 'git-fast-import --export-marks=marks.out <input &&
63 git-whatchanged master'
64 test_expect_success \
65 'A: verify pack' \
66 'for p in .git/objects/pack/*.pack;do git-verify-pack $p||exit;done'
67
68 cat >expect <<EOF
69 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
70 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
71
72 initial
73 EOF
74 test_expect_success \
75 'A: verify commit' \
76 'git-cat-file commit master | sed 1d >actual &&
77 diff -u expect actual'
78
79 cat >expect <<EOF
80 100644 blob file2
81 100644 blob file3
82 100755 blob file4
83 EOF
84 test_expect_success \
85 'A: verify tree' \
86 'git-cat-file -p master^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
87 diff -u expect actual'
88
89 echo "$file2_data" >expect
90 test_expect_success \
91 'A: verify file2' \
92 'git-cat-file blob master:file2 >actual && diff -u expect actual'
93
94 echo "$file3_data" >expect
95 test_expect_success \
96 'A: verify file3' \
97 'git-cat-file blob master:file3 >actual && diff -u expect actual'
98
99 printf "$file4_data" >expect
100 test_expect_success \
101 'A: verify file4' \
102 'git-cat-file blob master:file4 >actual && diff -u expect actual'
103
104 cat >expect <<EOF
105 :2 `git-rev-parse --verify master:file2`
106 :3 `git-rev-parse --verify master:file3`
107 :4 `git-rev-parse --verify master:file4`
108 :5 `git-rev-parse --verify master^0`
109 EOF
110 test_expect_success \
111 'A: verify marks output' \
112 'diff -u expect marks.out'
113
114 ###
115 ### series B
116 ###
117
118 test_tick
119 cat >input <<INPUT_END
120 commit refs/heads/branch
121 mark :1
122 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
123 data <<COMMIT
124 corrupt
125 COMMIT
126
127 from refs/heads/master
128 M 755 0000000000000000000000000000000000000001 zero1
129
130 INPUT_END
131 test_expect_failure \
132 'B: fail on invalid blob sha1' \
133 'git-fast-import <input'
134 rm -f .git/objects/pack_* .git/objects/index_*
135
136 ###
137 ### series C
138 ###
139
140 newf=`echo hi newf | git-hash-object -w --stdin`
141 oldf=`git-rev-parse --verify master:file2`
142 test_tick
143 cat >input <<INPUT_END
144 commit refs/heads/branch
145 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
146 data <<COMMIT
147 second
148 COMMIT
149
150 from refs/heads/master
151 M 644 $oldf file2/oldf
152 M 755 $newf file2/newf
153 D file3
154
155 INPUT_END
156 test_expect_success \
157 'C: incremental import create pack from stdin' \
158 'git-fast-import <input &&
159 git-whatchanged branch'
160 test_expect_success \
161 'C: verify pack' \
162 'for p in .git/objects/pack/*.pack;do git-verify-pack $p||exit;done'
163 test_expect_success \
164 'C: validate reuse existing blob' \
165 'test $newf = `git-rev-parse --verify branch:file2/newf`
166 test $oldf = `git-rev-parse --verify branch:file2/oldf`'
167
168 cat >expect <<EOF
169 parent `git-rev-parse --verify master^0`
170 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
171 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
172
173 second
174 EOF
175 test_expect_success \
176 'C: verify commit' \
177 'git-cat-file commit branch | sed 1d >actual &&
178 diff -u expect actual'
179
180 cat >expect <<EOF
181 :000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A file2/newf
182 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100 file2 file2/oldf
183 :100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D file3
184 EOF
185 git-diff-tree -M -r master branch >actual
186 test_expect_success \
187 'C: validate rename result' \
188 'compare_diff_raw expect actual'
189
190 ###
191 ### series D
192 ###
193
194 test_tick
195 cat >input <<INPUT_END
196 commit refs/heads/branch
197 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
198 data <<COMMIT
199 third
200 COMMIT
201
202 from refs/heads/branch^0
203 M 644 inline newdir/interesting
204 data <<EOF
205 $file5_data
206 EOF
207
208 M 755 inline newdir/exec.sh
209 data <<EOF
210 $file6_data
211 EOF
212
213 INPUT_END
214 test_expect_success \
215 'D: inline data in commit' \
216 'git-fast-import <input &&
217 git-whatchanged branch'
218 test_expect_success \
219 'D: verify pack' \
220 'for p in .git/objects/pack/*.pack;do git-verify-pack $p||exit;done'
221
222 cat >expect <<EOF
223 :000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A newdir/exec.sh
224 :000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A newdir/interesting
225 EOF
226 git-diff-tree -M -r branch^ branch >actual
227 test_expect_success \
228 'D: validate new files added' \
229 'compare_diff_raw expect actual'
230
231 echo "$file5_data" >expect
232 test_expect_success \
233 'D: verify file5' \
234 'git-cat-file blob branch:newdir/interesting >actual &&
235 diff -u expect actual'
236
237 echo "$file6_data" >expect
238 test_expect_success \
239 'D: verify file6' \
240 'git-cat-file blob branch:newdir/exec.sh >actual &&
241 diff -u expect actual'
242
243 test_done