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