t/t4002-diff-basic.sh

   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
  11 . "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
  12
  13 test_oid_cache <<\EOF
  14 aa_1 sha1:ccba72ad3888a3520b39efcf780b9ee64167535d
  15 aa_1 sha256:9febfbf18197819b2735c45291f138525d2476d59470f98239647544586ba403
  16
  17 aa_2 sha1:6aa2b5335b16431a0ef71e5c0a28be69183cf6a2
  18 aa_2 sha256:6eaa3437de83f145a4aaa6ba355303075ade547b128ec6a2cd00a81ff7ce7a56
  19
  20 an_1 sha1:7e426fb079479fd67f6d81f984e4ec649a44bc25
  21 an_1 sha256:8f92a0bec99e399a38e3bd0e1bf19fbf121e0160efb29b857df79d439f1c4536
  22
  23 dd_1 sha1:bcc68ef997017466d5c9094bcf7692295f588c9a
  24 dd_1 sha256:07e17428b00639b85485d2b01083d219e2f3e3ba8579e9ca44e9cc8dd554d952
  25
  26 df_1 sha1:6d50f65d3bdab91c63444294d38f08aeff328e42
  27 df_1 sha256:e367cecc27e9bf5451b1c65828cb21938d36a5f8e39c1b03ad6509cc36bb8e9d
  28
  29 df_2 sha1:71420ab81e254145d26d6fc0cddee64c1acd4787
  30 df_2 sha256:0f0a86d10347ff6921d03a3c954679f3f1d14fa3d5cd82f57b32c09755f3a47d
  31
  32 dfd1 sha1:68a6d8b91da11045cf4aa3a5ab9f2a781c701249
  33 dfd1 sha256:f3bd3265b02b6978ce86490d8ad026c573639c974b3de1d9faf30d8d5a77d3d5
  34
  35 dm_1 sha1:141c1f1642328e4bc46a7d801a71da392e66791e
  36 dm_1 sha256:c89f8656e7b94e21ee5fbaf0e2149bbf783c51edbe2ce110349cac13059ee7ed
  37
  38 dm_2 sha1:3c4d8de5fbad08572bab8e10eef8dbb264cf0231
  39 dm_2 sha256:83a572e37e0c94086294dae2cecc43d9131afd6f6c906e495c78972230b54988
  40
  41 dn_1 sha1:35abde1506ddf806572ff4d407bd06885d0f8ee9
  42 dn_1 sha256:775d5852582070e620be63327bfa515fab8f71c7ac3e4f0c3cd6267b4377ba28
  43
  44 ll_2 sha1:1d41122ebdd7a640f29d3c9cc4f9d70094374762
  45 ll_2 sha256:7917b4948a883cfed0a77d3d5a625dc8577d6ddcc3c6c3bbc56c4d4226a2246d
  46
  47 md_1 sha1:03f24c8c4700babccfd28b654e7e8eac402ad6cd
  48 md_1 sha256:fc9f30369b978595ad685ba11ca9a17de0af16d79cd4b629975f4f1590033902
  49
  50 md_2 sha1:103d9f89b50b9aad03054b579be5e7aa665f2d57
  51 md_2 sha256:fc78ec75275628762fe520479a6b2398dec295ce7aabcb1d15e5963c7b4e9317
  52
  53 mm_1 sha1:b258508afb7ceb449981bd9d63d2d3e971bf8d34
  54 mm_1 sha256:a4b7847d228e900e3000285e240c20fd96f9dd41ce1445305f6eada126d4a04a
  55
  56 mm_2 sha1:b431b272d829ff3aa4d1a5085f4394ab4d3305b6
  57 mm_2 sha256:3f8b83ea36aacf689bcf1a1290a9a8ed341564d32682ea6f76fea9a979186782
  58
  59 mm_3 sha1:19989d4559aae417fedee240ccf2ba315ea4dc2b
  60 mm_3 sha256:71b3bfc5747ac033fff9ea0ab39ee453a3af2969890e75d6ef547b87544e2681
  61
  62 mn_1 sha1:bd084b0c27c7b6cc34f11d6d0509a29be3caf970
  63 mn_1 sha256:47a67450583d7a329eb01a7c4ba644945af72c0ed2c7c95eb5a00d6e46d4d483
  64
  65 mn_2 sha1:a716d58de4a570e0038f5c307bd8db34daea021f
  66 mn_2 sha256:f95104c1ebe27acb84bac25a7be98c71f6b8d3054b21f357a5be0c524ad97e08
  67
  68 nm_1 sha1:c8f25781e8f1792e3e40b74225e20553041b5226
  69 nm_1 sha256:09baddc7afaa62e62e152c23c9c3ab94bf15a3894031e227e9be7fe68e1f4e49
  70
  71 nm_2 sha1:cdb9a8c3da571502ac30225e9c17beccb8387983
  72 nm_2 sha256:58b5227956ac2d2a08d0efa513c0ae37430948b16791ea3869a1308dbf05536d
  73
  74 na_1 sha1:15885881ea69115351c09b38371f0348a3fb8c67
  75 na_1 sha256:18e4fdd1670cd7968ee23d35bfd29e5418d56fb190c840094c1c57ceee0aad8f
  76
  77 nd_1 sha1:a4e179e4291e5536a5e1c82e091052772d2c5a93
  78 nd_1 sha256:07dac9b01d00956ea0c65bd993d7de4864aeef2ed3cbb1255d9f1d949fcd6df6
  79
  80 ss_1 sha1:40c959f984c8b89a2b02520d17f00d717f024397
  81 ss_1 sha256:50fc1b5df74d9910db2f9270993484235f15b69b75b01bcfb53e059289d14af9
  82
  83 ss_2 sha1:2ac547ae9614a00d1b28275de608131f7a0e259f
  84 ss_2 sha256:a90f02e6044f1497d13db587d22ab12f90150a7d1e084afcf96065fab35ae2bc
  85
  86 tt_1 sha1:4ac13458899ab908ef3b1128fa378daefc88d356
  87 tt_1 sha256:c53113c7dd5060e86b5b251428bd058f6726f66273c6a24bff1c61a04f498dd3
  88
  89 tt_2 sha1:4c86f9a85fbc5e6804ee2e17a797538fbe785bca
  90 tt_2 sha256:0775f2a296129a7cf2862b46bc0e88c14d593f2773a3e3fb1c5193db6f5a7e77
  91
  92 tt_3 sha1:c4e4a12231b9fa79a0053cb6077fcb21bb5b135a
  93 tt_3 sha256:47860f93cdd211f96443e0560f21c57ab6c2f4b0ac27ff03651a352e53fe8484
  94
  95 z__1 sha1:7d670fdcdb9929f6c7dac196ff78689cd1c566a1
  96 z__1 sha256:44d0f37aff5e51cfcfdd1134c93a6419bcca7b9964f792ffcd5f9b4fcba1ee63
  97
  98 z__2 sha1:5e5f22072bb39f6e12cf663a57cb634c76eefb49
  99 z__2 sha256:d29de162113190fed104eb5f010820cef4e315f89b9326e8497f7219fb737894
 100
 101 z__3 sha1:1ba523955d5160681af65cb776411f574c1e8155
 102 z__3 sha256:07422d772b07794ab4369a5648e617719f89c2d2212cbeab05d97214b6471636
 103
 104 zaa1 sha1:8acb8e9750e3f644bf323fcf3d338849db106c77
 105 zaa1 sha256:e79b029282c8abec2d9f3f7faceaf2a1405e02d1f368e66450ae66cf5b68d1f4
 106
 107 zaa2 sha1:6c0b99286d0bce551ac4a7b3dff8b706edff3715
 108 zaa2 sha256:c82bd78c3e69ea1796e6b1a7a3ba45bb106c50e819296475b862123d3f5cc5a0
 109
 110 zan1 sha1:087494262084cefee7ed484d20c8dc0580791272
 111 zan1 sha256:4b159eb3804d05599023dd074f771d06d02870f4ab24a7165add8ac3d703b8d3
 112
 113 zdd1 sha1:879007efae624d2b1307214b24a956f0a8d686a8
 114 zdd1 sha256:eecfdd4d8092dd0363fb6d4548b54c6afc8982c3ed9b34e393f1d6a921d8eaa3
 115
 116 zdm1 sha1:9b541b2275c06e3a7b13f28badf5294e2ae63df4
 117 zdm1 sha256:ab136e88e19a843c4bf7713d2090d5a2186ba16a6a80dacc12eeddd256a8e556
 118
 119 zdm2 sha1:d77371d15817fcaa57eeec27f770c505ba974ec1
 120 zdm2 sha256:1c1a5f57363f46a15d95ce8527b3c2c158d88d16853b4acbf81bd20fd2c89a46
 121
 122 zdn1 sha1:beb5d38c55283d280685ea21a0e50cfcc0ca064a
 123 zdn1 sha256:0f0eca66183617b0aa5ad74b256540329f841470922ca6760263c996d825eb18
 124
 125 zmd1 sha1:d41fda41b7ec4de46b43cb7ea42a45001ae393d5
 126 zmd1 sha256:1ed32d481852eddf31a0ce12652a0ad14bf5b7a842667b5dbb0b50f35bf1c80a
 127
 128 zmd2 sha1:a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9
 129 zmd2 sha256:b238da211b404f8917df2d9c6f7030535e904b2186131007a3c292ec6902f933
 130
 131 zmm1 sha1:4ca22bae2527d3d9e1676498a0fba3b355bd1278
 132 zmm1 sha256:072b1d85b5f34fabc99dfa46008c5418df68302d3e317430006f49b32d244226
 133
 134 zmm2 sha1:61422ba9c2c873416061a88cd40a59a35b576474
 135 zmm2 sha256:81dd5d2b3c5cda16fef552256aed4e2ea0802a8450a08f308a92142112ff6dda
 136
 137 zmm3 sha1:697aad7715a1e7306ca76290a3dd4208fbaeddfa
 138 zmm3 sha256:8b10fab49e9be3414aa5e9a93d0e46f9569053440138a7c19a5eb5536d8e95bf
 139
 140 zmn1 sha1:b16d7b25b869f2beb124efa53467d8a1550ad694
 141 zmn1 sha256:609e4f75d1295e844c826feeba213acb0b6cfc609adfe8ff705b19e3829ae3e9
 142
 143 zmn2 sha1:a5c544c21cfcb07eb80a4d89a5b7d1570002edfd
 144 zmn2 sha256:d6d03edf2dc1a3b267a8205de5f41a2ff4b03def8c7ae02052b543fb09d589fc
 145
 146 zna1 sha1:d12979c22fff69c59ca9409e7a8fe3ee25eaee80
 147 zna1 sha256:b37b80e789e8ea32aa323f004628f02013f632124b0282c7fe00a127d3c64c3c
 148
 149 znd1 sha1:a18393c636b98e9bd7296b8b437ea4992b72440c
 150 znd1 sha256:af92a22eee8c38410a0c9d2b5135a10aeb052cbc7cf675541ed9a67bfcaf7cf9
 151
 152 znm1 sha1:3fdbe17fd013303a2e981e1ca1c6cd6e72789087
 153 znm1 sha256:f75aeaa0c11e76918e381c105f0752932c6150e941fec565d24fa31098a13dc1
 154
 155 znm2 sha1:7e09d6a3a14bd630913e8c75693cea32157b606d
 156 znm2 sha256:938d73cfbaa1c902a84fb5b3afd9736aa0590367fb9bd59c6c4d072ce70fcd6d
 157 EOF
 158
 159 cat >.test-plain-OA <<EOF
 160 :000000 100644 $(test_oid zero) $(test_oid aa_1) A      AA
 161 :000000 100644 $(test_oid zero) $(test_oid an_1) A      AN
 162 :100644 000000 $(test_oid dd_1) $(test_oid zero) D      DD
 163 :000000 040000 $(test_oid zero) $(test_oid df_1) A      DF
 164 :100644 000000 $(test_oid dm_1) $(test_oid zero) D      DM
 165 :100644 000000 $(test_oid dn_1) $(test_oid zero) D      DN
 166 :000000 100644 $(test_oid zero) $(test_oid ll_2) A      LL
 167 :100644 100644 $(test_oid md_1) $(test_oid md_2) M      MD
 168 :100644 100644 $(test_oid mm_1) $(test_oid mm_2) M      MM
 169 :100644 100644 $(test_oid mn_1) $(test_oid mn_2) M      MN
 170 :100644 100644 $(test_oid ss_1) $(test_oid ss_2) M      SS
 171 :100644 100644 $(test_oid tt_1) $(test_oid tt_2) M      TT
 172 :040000 040000 $(test_oid z__1) $(test_oid z__2) M      Z
 173 EOF
 174
 175 cat >.test-recursive-OA <<EOF
 176 :000000 100644 $(test_oid zero) $(test_oid aa_1) A      AA
 177 :000000 100644 $(test_oid zero) $(test_oid an_1) A      AN
 178 :100644 000000 $(test_oid dd_1) $(test_oid zero) D      DD
 179 :000000 100644 $(test_oid zero) $(test_oid dfd1) A      DF/DF
 180 :100644 000000 $(test_oid dm_1) $(test_oid zero) D      DM
 181 :100644 000000 $(test_oid dn_1) $(test_oid zero) D      DN
 182 :000000 100644 $(test_oid zero) $(test_oid ll_2) A      LL
 183 :100644 100644 $(test_oid md_1) $(test_oid md_2) M      MD
 184 :100644 100644 $(test_oid mm_1) $(test_oid mm_2) M      MM
 185 :100644 100644 $(test_oid mn_1) $(test_oid mn_2) M      MN
 186 :100644 100644 $(test_oid ss_1) $(test_oid ss_2) M      SS
 187 :100644 100644 $(test_oid tt_1) $(test_oid tt_2) M      TT
 188 :000000 100644 $(test_oid zero) $(test_oid zaa1) A      Z/AA
 189 :000000 100644 $(test_oid zero) $(test_oid zan1) A      Z/AN
 190 :100644 000000 $(test_oid zdd1) $(test_oid zero) D      Z/DD
 191 :100644 000000 $(test_oid zdm1) $(test_oid zero) D      Z/DM
 192 :100644 000000 $(test_oid zdn1) $(test_oid zero) D      Z/DN
 193 :100644 100644 $(test_oid zmd1) $(test_oid zmd2) M      Z/MD
 194 :100644 100644 $(test_oid zmm1) $(test_oid zmm2) M      Z/MM
 195 :100644 100644 $(test_oid zmn1) $(test_oid zmn2) M      Z/MN
 196 EOF
 197 cat >.test-plain-OB <<EOF
 198 :000000 100644 $(test_oid zero) $(test_oid aa_2) A      AA
 199 :100644 000000 $(test_oid dd_1) $(test_oid zero) D      DD
 200 :000000 100644 $(test_oid zero) $(test_oid df_2) A      DF
 201 :100644 100644 $(test_oid dm_1) $(test_oid dm_2) M      DM
 202 :000000 100644 $(test_oid zero) $(test_oid ll_2) A      LL
 203 :100644 000000 $(test_oid md_1) $(test_oid zero) D      MD
 204 :100644 100644 $(test_oid mm_1) $(test_oid mm_3) M      MM
 205 :000000 100644 $(test_oid zero) $(test_oid na_1) A      NA
 206 :100644 000000 $(test_oid nd_1) $(test_oid zero) D      ND
 207 :100644 100644 $(test_oid nm_1) $(test_oid nm_2) M      NM
 208 :100644 100644 $(test_oid ss_1) $(test_oid ss_2) M      SS
 209 :100644 100644 $(test_oid tt_1) $(test_oid tt_3) M      TT
 210 :040000 040000 $(test_oid z__1) $(test_oid z__3) M      Z
 211 EOF
 212 cat >.test-recursive-OB <<EOF
 213 :000000 100644 $(test_oid zero) $(test_oid aa_2) A      AA
 214 :100644 000000 $(test_oid dd_1) $(test_oid zero) D      DD
 215 :000000 100644 $(test_oid zero) $(test_oid df_2) A      DF
 216 :100644 100644 $(test_oid dm_1) $(test_oid dm_2) M      DM
 217 :000000 100644 $(test_oid zero) $(test_oid ll_2) A      LL
 218 :100644 000000 $(test_oid md_1) $(test_oid zero) D      MD
 219 :100644 100644 $(test_oid mm_1) $(test_oid mm_3) M      MM
 220 :000000 100644 $(test_oid zero) $(test_oid na_1) A      NA
 221 :100644 000000 $(test_oid nd_1) $(test_oid zero) D      ND
 222 :100644 100644 $(test_oid nm_1) $(test_oid nm_2) M      NM
 223 :100644 100644 $(test_oid ss_1) $(test_oid ss_2) M      SS
 224 :100644 100644 $(test_oid tt_1) $(test_oid tt_3) M      TT
 225 :000000 100644 $(test_oid zero) $(test_oid zaa2) A      Z/AA
 226 :100644 000000 $(test_oid zdd1) $(test_oid zero) D      Z/DD
 227 :100644 100644 $(test_oid zdm1) $(test_oid zdm2) M      Z/DM
 228 :100644 000000 $(test_oid zmd1) $(test_oid zero) D      Z/MD
 229 :100644 100644 $(test_oid zmm1) $(test_oid zmm3) M      Z/MM
 230 :000000 100644 $(test_oid zero) $(test_oid zna1) A      Z/NA
 231 :100644 000000 $(test_oid znd1) $(test_oid zero) D      Z/ND
 232 :100644 100644 $(test_oid znm1) $(test_oid znm2) M      Z/NM
 233 EOF
 234 cat >.test-plain-AB <<EOF
 235 :100644 100644 $(test_oid aa_1) $(test_oid aa_2) M      AA
 236 :100644 000000 $(test_oid an_1) $(test_oid zero) D      AN
 237 :000000 100644 $(test_oid zero) $(test_oid df_2) A      DF
 238 :040000 000000 $(test_oid df_1) $(test_oid zero) D      DF
 239 :000000 100644 $(test_oid zero) $(test_oid dm_2) A      DM
 240 :000000 100644 $(test_oid zero) $(test_oid dn_1) A      DN
 241 :100644 000000 $(test_oid md_2) $(test_oid zero) D      MD
 242 :100644 100644 $(test_oid mm_2) $(test_oid mm_3) M      MM
 243 :100644 100644 $(test_oid mn_2) $(test_oid mn_1) M      MN
 244 :000000 100644 $(test_oid zero) $(test_oid na_1) A      NA
 245 :100644 000000 $(test_oid nd_1) $(test_oid zero) D      ND
 246 :100644 100644 $(test_oid nm_1) $(test_oid nm_2) M      NM
 247 :100644 100644 $(test_oid tt_2) $(test_oid tt_3) M      TT
 248 :040000 040000 $(test_oid z__2) $(test_oid z__3) M      Z
 249 EOF
 250 cat >.test-recursive-AB <<EOF
 251 :100644 100644 $(test_oid aa_1) $(test_oid aa_2) M      AA
 252 :100644 000000 $(test_oid an_1) $(test_oid zero) D      AN
 253 :000000 100644 $(test_oid zero) $(test_oid df_2) A      DF
 254 :100644 000000 $(test_oid dfd1) $(test_oid zero) D      DF/DF
 255 :000000 100644 $(test_oid zero) $(test_oid dm_2) A      DM
 256 :000000 100644 $(test_oid zero) $(test_oid dn_1) A      DN
 257 :100644 000000 $(test_oid md_2) $(test_oid zero) D      MD
 258 :100644 100644 $(test_oid mm_2) $(test_oid mm_3) M      MM
 259 :100644 100644 $(test_oid mn_2) $(test_oid mn_1) M      MN
 260 :000000 100644 $(test_oid zero) $(test_oid na_1) A      NA
 261 :100644 000000 $(test_oid nd_1) $(test_oid zero) D      ND
 262 :100644 100644 $(test_oid nm_1) $(test_oid nm_2) M      NM
 263 :100644 100644 $(test_oid tt_2) $(test_oid tt_3) M      TT
 264 :100644 100644 $(test_oid zaa1) $(test_oid zaa2) M      Z/AA
 265 :100644 000000 $(test_oid zan1) $(test_oid zero) D      Z/AN
 266 :000000 100644 $(test_oid zero) $(test_oid zdm2) A      Z/DM
 267 :000000 100644 $(test_oid zero) $(test_oid zdn1) A      Z/DN
 268 :100644 000000 $(test_oid zmd2) $(test_oid zero) D      Z/MD
 269 :100644 100644 $(test_oid zmm2) $(test_oid zmm3) M      Z/MM
 270 :100644 100644 $(test_oid zmn2) $(test_oid zmn1) M      Z/MN
 271 :000000 100644 $(test_oid zero) $(test_oid zna1) A      Z/NA
 272 :100644 000000 $(test_oid znd1) $(test_oid zero) D      Z/ND
 273 :100644 100644 $(test_oid znm1) $(test_oid znm2) M      Z/NM
 274 EOF
 275
 276 cmp_diff_files_output () {
 277     # diff-files never reports additions.  Also it does not fill in the
 278     # object ID for the changed files because it wants you to look at the
 279     # filesystem.
 280     sed <"$2" >.test-tmp \
 281         -e '/^:000000 /d;s/'$OID_REGEX'\( [MCRNDU][0-9]*\)      /'$ZERO_OID'\1  /' &&
 282     test_cmp "$1" .test-tmp
 283 }
 284
 285 test_expect_success \
 286     'diff-tree of known trees.' \
 287     'git diff-tree $tree_O $tree_A >.test-a &&
 288      cmp -s .test-a .test-plain-OA'
 289
 290 test_expect_success \
 291     'diff-tree of known trees.' \
 292     'git diff-tree -r $tree_O $tree_A >.test-a &&
 293      cmp -s .test-a .test-recursive-OA'
 294
 295 test_expect_success \
 296     'diff-tree of known trees.' \
 297     'git diff-tree $tree_O $tree_B >.test-a &&
 298      cmp -s .test-a .test-plain-OB'
 299
 300 test_expect_success \
 301     'diff-tree of known trees.' \
 302     'git diff-tree -r $tree_O $tree_B >.test-a &&
 303      cmp -s .test-a .test-recursive-OB'
 304
 305 test_expect_success \
 306     'diff-tree of known trees.' \
 307     'git diff-tree $tree_A $tree_B >.test-a &&
 308      cmp -s .test-a .test-plain-AB'
 309
 310 test_expect_success \
 311     'diff-tree of known trees.' \
 312     'git diff-tree -r $tree_A $tree_B >.test-a &&
 313      cmp -s .test-a .test-recursive-AB'
 314
 315 test_expect_success \
 316     'diff-tree --stdin of known trees.' \
 317     'echo $tree_A $tree_B | git diff-tree --stdin > .test-a &&
 318      echo $tree_A $tree_B > .test-plain-ABx &&
 319      cat .test-plain-AB >> .test-plain-ABx &&
 320      cmp -s .test-a .test-plain-ABx'
 321
 322 test_expect_success \
 323     'diff-tree --stdin of known trees.' \
 324     'echo $tree_A $tree_B | git diff-tree -r --stdin > .test-a &&
 325      echo $tree_A $tree_B > .test-recursive-ABx &&
 326      cat .test-recursive-AB >> .test-recursive-ABx &&
 327      cmp -s .test-a .test-recursive-ABx'
 328
 329 test_expect_success \
 330     'diff-cache O with A in cache' \
 331     'git read-tree $tree_A &&
 332      git diff-index --cached $tree_O >.test-a &&
 333      cmp -s .test-a .test-recursive-OA'
 334
 335 test_expect_success \
 336     'diff-cache O with B in cache' \
 337     'git read-tree $tree_B &&
 338      git diff-index --cached $tree_O >.test-a &&
 339      cmp -s .test-a .test-recursive-OB'
 340
 341 test_expect_success \
 342     'diff-cache A with B in cache' \
 343     'git read-tree $tree_B &&
 344      git diff-index --cached $tree_A >.test-a &&
 345      cmp -s .test-a .test-recursive-AB'
 346
 347 test_expect_success \
 348     'diff-files with O in cache and A checked out' \
 349     'rm -fr Z [A-Z][A-Z] &&
 350      git read-tree $tree_A &&
 351      git checkout-index -f -a &&
 352      git read-tree --reset $tree_O &&
 353      test_must_fail git update-index --refresh -q &&
 354      git diff-files >.test-a &&
 355      cmp_diff_files_output .test-a .test-recursive-OA'
 356
 357 test_expect_success \
 358     'diff-files with O in cache and B checked out' \
 359     'rm -fr Z [A-Z][A-Z] &&
 360      git read-tree $tree_B &&
 361      git checkout-index -f -a &&
 362      git read-tree --reset $tree_O &&
 363      test_must_fail git update-index --refresh -q &&
 364      git diff-files >.test-a &&
 365      cmp_diff_files_output .test-a .test-recursive-OB'
 366
 367 test_expect_success \
 368     'diff-files with A in cache and B checked out' \
 369     'rm -fr Z [A-Z][A-Z] &&
 370      git read-tree $tree_B &&
 371      git checkout-index -f -a &&
 372      git read-tree --reset $tree_A &&
 373      test_must_fail git update-index --refresh -q &&
 374      git diff-files >.test-a &&
 375      cmp_diff_files_output .test-a .test-recursive-AB'
 376
 377 ################################################################
 378 # Now we have established the baseline, we do not have to
 379 # rely on individual object ID values that much.
 380
 381 test_expect_success \
 382     'diff-tree O A == diff-tree -R A O' \
 383     'git diff-tree $tree_O $tree_A >.test-a &&
 384     git diff-tree -R $tree_A $tree_O >.test-b &&
 385     cmp -s .test-a .test-b'
 386
 387 test_expect_success \
 388     'diff-tree -r O A == diff-tree -r -R A O' \
 389     'git diff-tree -r $tree_O $tree_A >.test-a &&
 390     git diff-tree -r -R $tree_A $tree_O >.test-b &&
 391     cmp -s .test-a .test-b'
 392
 393 test_expect_success \
 394     'diff-tree B A == diff-tree -R A B' \
 395     'git diff-tree $tree_B $tree_A >.test-a &&
 396     git diff-tree -R $tree_A $tree_B >.test-b &&
 397     cmp -s .test-a .test-b'
 398
 399 test_expect_success \
 400     'diff-tree -r B A == diff-tree -r -R A B' \
 401     'git diff-tree -r $tree_B $tree_A >.test-a &&
 402     git diff-tree -r -R $tree_A $tree_B >.test-b &&
 403     cmp -s .test-a .test-b'
 404
 405 test_expect_success \
 406     'diff can read from stdin' \
 407     'test_must_fail git diff --no-index -- MN - < NN |
 408         grep -v "^index" | sed "s#/-#/NN#" >.test-a &&
 409     test_must_fail git diff --no-index -- MN NN |
 410         grep -v "^index" >.test-b &&
 411     test_cmp .test-a .test-b'
 412
 413 test_done