blob: 5da05be2c1a0d49b7b405e5a7f5cbf4d0af0790a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
|
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
test_description='Test diff raw-output.
'
. ./test-lib.sh
. ../lib-read-tree-m-3way.sh
cat >.test-plain-OA <<\EOF
+100644 blob ccba72ad3888a3520b39efcf780b9ee64167535d AA
+100644 blob 7e426fb079479fd67f6d81f984e4ec649a44bc25 AN
-100644 blob bcc68ef997017466d5c9094bcf7692295f588c9a DD
+040000 tree 6d50f65d3bdab91c63444294d38f08aeff328e42 DF
-100644 blob 141c1f1642328e4bc46a7d801a71da392e66791e DM
-100644 blob 35abde1506ddf806572ff4d407bd06885d0f8ee9 DN
+100644 blob 1d41122ebdd7a640f29d3c9cc4f9d70094374762 LL
*100644->100644 blob 03f24c8c4700babccfd28b654e7e8eac402ad6cd->103d9f89b50b9aad03054b579be5e7aa665f2d57 MD
*100644->100644 blob b258508afb7ceb449981bd9d63d2d3e971bf8d34->b431b272d829ff3aa4d1a5085f4394ab4d3305b6 MM
*100644->100644 blob bd084b0c27c7b6cc34f11d6d0509a29be3caf970->a716d58de4a570e0038f5c307bd8db34daea021f MN
*100644->100644 blob 40c959f984c8b89a2b02520d17f00d717f024397->2ac547ae9614a00d1b28275de608131f7a0e259f SS
*100644->100644 blob 4ac13458899ab908ef3b1128fa378daefc88d356->4c86f9a85fbc5e6804ee2e17a797538fbe785bca TT
*040000->040000 tree 7d670fdcdb9929f6c7dac196ff78689cd1c566a1->5e5f22072bb39f6e12cf663a57cb634c76eefb49 Z
EOF
cat >.test-recursive-OA <<\EOF
+100644 blob ccba72ad3888a3520b39efcf780b9ee64167535d AA
+100644 blob 7e426fb079479fd67f6d81f984e4ec649a44bc25 AN
-100644 blob bcc68ef997017466d5c9094bcf7692295f588c9a DD
+100644 blob 68a6d8b91da11045cf4aa3a5ab9f2a781c701249 DF/DF
-100644 blob 141c1f1642328e4bc46a7d801a71da392e66791e DM
-100644 blob 35abde1506ddf806572ff4d407bd06885d0f8ee9 DN
+100644 blob 1d41122ebdd7a640f29d3c9cc4f9d70094374762 LL
*100644->100644 blob 03f24c8c4700babccfd28b654e7e8eac402ad6cd->103d9f89b50b9aad03054b579be5e7aa665f2d57 MD
*100644->100644 blob b258508afb7ceb449981bd9d63d2d3e971bf8d34->b431b272d829ff3aa4d1a5085f4394ab4d3305b6 MM
*100644->100644 blob bd084b0c27c7b6cc34f11d6d0509a29be3caf970->a716d58de4a570e0038f5c307bd8db34daea021f MN
*100644->100644 blob 40c959f984c8b89a2b02520d17f00d717f024397->2ac547ae9614a00d1b28275de608131f7a0e259f SS
*100644->100644 blob 4ac13458899ab908ef3b1128fa378daefc88d356->4c86f9a85fbc5e6804ee2e17a797538fbe785bca TT
+100644 blob 8acb8e9750e3f644bf323fcf3d338849db106c77 Z/AA
+100644 blob 087494262084cefee7ed484d20c8dc0580791272 Z/AN
-100644 blob 879007efae624d2b1307214b24a956f0a8d686a8 Z/DD
-100644 blob 9b541b2275c06e3a7b13f28badf5294e2ae63df4 Z/DM
-100644 blob beb5d38c55283d280685ea21a0e50cfcc0ca064a Z/DN
*100644->100644 blob d41fda41b7ec4de46b43cb7ea42a45001ae393d5->a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 Z/MD
*100644->100644 blob 4ca22bae2527d3d9e1676498a0fba3b355bd1278->61422ba9c2c873416061a88cd40a59a35b576474 Z/MM
*100644->100644 blob b16d7b25b869f2beb124efa53467d8a1550ad694->a5c544c21cfcb07eb80a4d89a5b7d1570002edfd Z/MN
EOF
cat >.test-plain-OB <<\EOF
+100644 blob 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 AA
-100644 blob bcc68ef997017466d5c9094bcf7692295f588c9a DD
+100644 blob 71420ab81e254145d26d6fc0cddee64c1acd4787 DF
*100644->100644 blob 141c1f1642328e4bc46a7d801a71da392e66791e->3c4d8de5fbad08572bab8e10eef8dbb264cf0231 DM
+100644 blob 1d41122ebdd7a640f29d3c9cc4f9d70094374762 LL
-100644 blob 03f24c8c4700babccfd28b654e7e8eac402ad6cd MD
*100644->100644 blob b258508afb7ceb449981bd9d63d2d3e971bf8d34->19989d4559aae417fedee240ccf2ba315ea4dc2b MM
+100644 blob 15885881ea69115351c09b38371f0348a3fb8c67 NA
-100644 blob a4e179e4291e5536a5e1c82e091052772d2c5a93 ND
*100644->100644 blob c8f25781e8f1792e3e40b74225e20553041b5226->cdb9a8c3da571502ac30225e9c17beccb8387983 NM
*100644->100644 blob 40c959f984c8b89a2b02520d17f00d717f024397->2ac547ae9614a00d1b28275de608131f7a0e259f SS
*100644->100644 blob 4ac13458899ab908ef3b1128fa378daefc88d356->c4e4a12231b9fa79a0053cb6077fcb21bb5b135a TT
*040000->040000 tree 7d670fdcdb9929f6c7dac196ff78689cd1c566a1->1ba523955d5160681af65cb776411f574c1e8155 Z
EOF
cat >.test-recursive-OB <<\EOF
+100644 blob 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 AA
-100644 blob bcc68ef997017466d5c9094bcf7692295f588c9a DD
+100644 blob 71420ab81e254145d26d6fc0cddee64c1acd4787 DF
*100644->100644 blob 141c1f1642328e4bc46a7d801a71da392e66791e->3c4d8de5fbad08572bab8e10eef8dbb264cf0231 DM
+100644 blob 1d41122ebdd7a640f29d3c9cc4f9d70094374762 LL
-100644 blob 03f24c8c4700babccfd28b654e7e8eac402ad6cd MD
*100644->100644 blob b258508afb7ceb449981bd9d63d2d3e971bf8d34->19989d4559aae417fedee240ccf2ba315ea4dc2b MM
+100644 blob 15885881ea69115351c09b38371f0348a3fb8c67 NA
-100644 blob a4e179e4291e5536a5e1c82e091052772d2c5a93 ND
*100644->100644 blob c8f25781e8f1792e3e40b74225e20553041b5226->cdb9a8c3da571502ac30225e9c17beccb8387983 NM
*100644->100644 blob 40c959f984c8b89a2b02520d17f00d717f024397->2ac547ae9614a00d1b28275de608131f7a0e259f SS
*100644->100644 blob 4ac13458899ab908ef3b1128fa378daefc88d356->c4e4a12231b9fa79a0053cb6077fcb21bb5b135a TT
+100644 blob 6c0b99286d0bce551ac4a7b3dff8b706edff3715 Z/AA
-100644 blob 879007efae624d2b1307214b24a956f0a8d686a8 Z/DD
*100644->100644 blob 9b541b2275c06e3a7b13f28badf5294e2ae63df4->d77371d15817fcaa57eeec27f770c505ba974ec1 Z/DM
-100644 blob d41fda41b7ec4de46b43cb7ea42a45001ae393d5 Z/MD
*100644->100644 blob 4ca22bae2527d3d9e1676498a0fba3b355bd1278->697aad7715a1e7306ca76290a3dd4208fbaeddfa Z/MM
+100644 blob d12979c22fff69c59ca9409e7a8fe3ee25eaee80 Z/NA
-100644 blob a18393c636b98e9bd7296b8b437ea4992b72440c Z/ND
*100644->100644 blob 3fdbe17fd013303a2e981e1ca1c6cd6e72789087->7e09d6a3a14bd630913e8c75693cea32157b606d Z/NM
EOF
cat >.test-plain-AB <<\EOF
*100644->100644 blob ccba72ad3888a3520b39efcf780b9ee64167535d->6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 AA
-100644 blob 7e426fb079479fd67f6d81f984e4ec649a44bc25 AN
+100644 blob 71420ab81e254145d26d6fc0cddee64c1acd4787 DF
-040000 tree 6d50f65d3bdab91c63444294d38f08aeff328e42 DF
+100644 blob 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 DM
+100644 blob 35abde1506ddf806572ff4d407bd06885d0f8ee9 DN
-100644 blob 103d9f89b50b9aad03054b579be5e7aa665f2d57 MD
*100644->100644 blob b431b272d829ff3aa4d1a5085f4394ab4d3305b6->19989d4559aae417fedee240ccf2ba315ea4dc2b MM
*100644->100644 blob a716d58de4a570e0038f5c307bd8db34daea021f->bd084b0c27c7b6cc34f11d6d0509a29be3caf970 MN
+100644 blob 15885881ea69115351c09b38371f0348a3fb8c67 NA
-100644 blob a4e179e4291e5536a5e1c82e091052772d2c5a93 ND
*100644->100644 blob c8f25781e8f1792e3e40b74225e20553041b5226->cdb9a8c3da571502ac30225e9c17beccb8387983 NM
*100644->100644 blob 4c86f9a85fbc5e6804ee2e17a797538fbe785bca->c4e4a12231b9fa79a0053cb6077fcb21bb5b135a TT
*040000->040000 tree 5e5f22072bb39f6e12cf663a57cb634c76eefb49->1ba523955d5160681af65cb776411f574c1e8155 Z
EOF
cat >.test-recursive-AB <<\EOF
*100644->100644 blob ccba72ad3888a3520b39efcf780b9ee64167535d->6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 AA
-100644 blob 7e426fb079479fd67f6d81f984e4ec649a44bc25 AN
+100644 blob 71420ab81e254145d26d6fc0cddee64c1acd4787 DF
-100644 blob 68a6d8b91da11045cf4aa3a5ab9f2a781c701249 DF/DF
+100644 blob 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 DM
+100644 blob 35abde1506ddf806572ff4d407bd06885d0f8ee9 DN
-100644 blob 103d9f89b50b9aad03054b579be5e7aa665f2d57 MD
*100644->100644 blob b431b272d829ff3aa4d1a5085f4394ab4d3305b6->19989d4559aae417fedee240ccf2ba315ea4dc2b MM
*100644->100644 blob a716d58de4a570e0038f5c307bd8db34daea021f->bd084b0c27c7b6cc34f11d6d0509a29be3caf970 MN
+100644 blob 15885881ea69115351c09b38371f0348a3fb8c67 NA
-100644 blob a4e179e4291e5536a5e1c82e091052772d2c5a93 ND
*100644->100644 blob c8f25781e8f1792e3e40b74225e20553041b5226->cdb9a8c3da571502ac30225e9c17beccb8387983 NM
*100644->100644 blob 4c86f9a85fbc5e6804ee2e17a797538fbe785bca->c4e4a12231b9fa79a0053cb6077fcb21bb5b135a TT
*100644->100644 blob 8acb8e9750e3f644bf323fcf3d338849db106c77->6c0b99286d0bce551ac4a7b3dff8b706edff3715 Z/AA
-100644 blob 087494262084cefee7ed484d20c8dc0580791272 Z/AN
+100644 blob d77371d15817fcaa57eeec27f770c505ba974ec1 Z/DM
+100644 blob beb5d38c55283d280685ea21a0e50cfcc0ca064a Z/DN
-100644 blob a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 Z/MD
*100644->100644 blob 61422ba9c2c873416061a88cd40a59a35b576474->697aad7715a1e7306ca76290a3dd4208fbaeddfa Z/MM
*100644->100644 blob a5c544c21cfcb07eb80a4d89a5b7d1570002edfd->b16d7b25b869f2beb124efa53467d8a1550ad694 Z/MN
+100644 blob d12979c22fff69c59ca9409e7a8fe3ee25eaee80 Z/NA
-100644 blob a18393c636b98e9bd7296b8b437ea4992b72440c Z/ND
*100644->100644 blob 3fdbe17fd013303a2e981e1ca1c6cd6e72789087->7e09d6a3a14bd630913e8c75693cea32157b606d Z/NM
EOF
x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
x40="$x40$x40$x40$x40$x40$x40$x40$x40"
z40='0000000000000000000000000000000000000000'
cmp_diff_files_output () {
# diff-files never reports additions. Also it does not fill in the
# object ID for the changed files because it wants you to look at the
# filesystem.
sed <"$2" >.test-tmp \
-e '/^+/d;/\^*/s/\( '$x40'->\)'$x40' /\1'$z40' /' &&
diff "$1" .test-tmp
}
test_expect_success \
'diff-tree of known trees.' \
'git-diff-tree $tree_O $tree_A >.test-a &&
cmp -s .test-a .test-plain-OA'
test_expect_success \
'diff-tree of known trees.' \
'git-diff-tree -r $tree_O $tree_A >.test-a &&
cmp -s .test-a .test-recursive-OA'
test_expect_success \
'diff-tree of known trees.' \
'git-diff-tree $tree_O $tree_B >.test-a &&
cmp -s .test-a .test-plain-OB'
test_expect_success \
'diff-tree of known trees.' \
'git-diff-tree -r $tree_O $tree_B >.test-a &&
cmp -s .test-a .test-recursive-OB'
test_expect_success \
'diff-tree of known trees.' \
'git-diff-tree $tree_A $tree_B >.test-a &&
cmp -s .test-a .test-plain-AB'
test_expect_success \
'diff-tree of known trees.' \
'git-diff-tree -r $tree_A $tree_B >.test-a &&
cmp -s .test-a .test-recursive-AB'
test_expect_success \
'diff-cache O with A in cache' \
'git-read-tree $tree_A &&
git-diff-cache --cached $tree_O >.test-a &&
cmp -s .test-a .test-recursive-OA'
test_expect_success \
'diff-cache O with B in cache' \
'git-read-tree $tree_B &&
git-diff-cache --cached $tree_O >.test-a &&
cmp -s .test-a .test-recursive-OB'
test_expect_success \
'diff-cache A with B in cache' \
'git-read-tree $tree_B &&
git-diff-cache --cached $tree_A >.test-a &&
cmp -s .test-a .test-recursive-AB'
test_expect_success \
'diff-files with O in cache and A checked out' \
'rm -fr Z [A-Z][A-Z] &&
git-read-tree $tree_A &&
git-checkout-cache -f -a &&
git-read-tree -m $tree_O || (exit 1)
git-update-cache --refresh >/dev/null ;# this can exit non-zero
git-diff-files >.test-a &&
cmp_diff_files_output .test-a .test-recursive-OA'
test_expect_success \
'diff-files with O in cache and B checked out' \
'rm -fr Z [A-Z][A-Z] &&
git-read-tree $tree_B &&
git-checkout-cache -f -a &&
git-read-tree -m $tree_O || (exit 1)
git-update-cache --refresh >/dev/null ;# this can exit non-zero
git-diff-files >.test-a &&
cmp_diff_files_output .test-a .test-recursive-OB'
test_expect_success \
'diff-files with A in cache and B checked out' \
'rm -fr Z [A-Z][A-Z] &&
git-read-tree $tree_B &&
git-checkout-cache -f -a &&
git-read-tree -m $tree_A || (exit 1)
git-update-cache --refresh >/dev/null ;# this can exit non-zero
git-diff-files >.test-a &&
cmp_diff_files_output .test-a .test-recursive-AB'
################################################################
# Now we have established the baseline, we do not have to
# rely on individual object ID values that much.
test_expect_success \
'diff-tree O A == diff-tree -R A O' \
'git-diff-tree $tree_O $tree_A >.test-a &&
git-diff-tree -R $tree_A $tree_O >.test-b &&
cmp -s .test-a .test-b'
test_expect_success \
'diff-tree -r O A == diff-tree -r -R A O' \
'git-diff-tree -r $tree_O $tree_A >.test-a &&
git-diff-tree -r -R $tree_A $tree_O >.test-b &&
cmp -s .test-a .test-b'
test_expect_success \
'diff-tree B A == diff-tree -R A B' \
'git-diff-tree $tree_B $tree_A >.test-a &&
git-diff-tree -R $tree_A $tree_B >.test-b &&
cmp -s .test-a .test-b'
test_expect_success \
'diff-tree -r B A == diff-tree -r -R A B' \
'git-diff-tree -r $tree_B $tree_A >.test-a &&
git-diff-tree -r -R $tree_A $tree_B >.test-b &&
cmp -s .test-a .test-b'
test_done
|
